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 2005/12/27 00:05:17 UTC
svn commit: r359122 - in /directory/shared/ldap/trunk/common/src:
main/java/org/apache/ldap/common/filter/
main/java/org/apache/ldap/common/message/
main/java/org/apache/ldap/common/name/
main/java/org/apache/ldap/common/util/ test/org/apache/ldap/comm...
Author: elecharny
Date: Mon Dec 26 15:05:04 2005
New Revision: 359122
URL: http://svn.apache.org/viewcvs?rev=359122&view=rev
Log:
- Used StringTools instead of StringUtils
- Cleaned some imports
Modified:
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/ExtensibleNode.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/SimpleNode.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/BindRequestImpl.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/CompareRequestImpl.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ExtendedRequestImpl.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/MessageDecoder.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ModifyRequestImpl.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/name/LdapName.java
directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/util/AttributeUtils.java
directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/filter/FilterParserImplTest.java
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/ExtensibleNode.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/ExtensibleNode.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/ExtensibleNode.java Mon Dec 26 15:05:04 2005
@@ -25,7 +25,7 @@
*/
package org.apache.ldap.common.filter;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -57,7 +57,7 @@
public ExtensibleNode( String attribute, String value,
String matchingRuleId, boolean dnAttributes )
{
- this( attribute, StringUtils.getBytesUtf8( value ), matchingRuleId, dnAttributes );
+ this( attribute, StringTools.getBytesUtf8( value ), matchingRuleId, dnAttributes );
}
/**
@@ -123,9 +123,9 @@
buf.append( "-EXTENSIBLE-" );
buf.append( this.matchingRuleId );
buf.append( "-" );
- buf.append( StringUtils.utf8ToString( this.value ) );
+ buf.append( StringTools.utf8ToString( this.value ) );
buf.append( "/" );
- buf.append( StringUtils.dumpBytes( this.value ) );
+ buf.append( StringTools.dumpBytes( this.value ) );
buf.append( ')' );
if ( ( null != getAnnotations() )
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/SimpleNode.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/SimpleNode.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/SimpleNode.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/filter/SimpleNode.java Mon Dec 26 15:05:04 2005
@@ -16,7 +16,7 @@
*/
package org.apache.ldap.common.filter ;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -39,7 +39,7 @@
*/
public SimpleNode( String attribute, byte[] value, int type )
{
- this( attribute, StringUtils.utf8ToString( value ), type );
+ this( attribute, StringTools.utf8ToString( value ), type );
}
/**
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/BindRequestImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/BindRequestImpl.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/BindRequestImpl.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/BindRequestImpl.java Mon Dec 26 15:05:04 2005
@@ -17,8 +17,8 @@
package org.apache.ldap.common.message;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.util.ArrayUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -305,7 +305,7 @@
sb.append( " BindRequest\n" );
sb.append( " Version : '" ).append( isVersion3 ? "3" : "2" ).append( "'\n" );
- if ( StringUtils.isEmpty( name.toString() ) )
+ if ( StringTools.isEmpty( name.toString() ) )
{
sb.append( " Name : anonymous\n" );
}
@@ -316,9 +316,9 @@
if ( isSimple )
{
sb.append( " Simple authentication : '" )
- .append( StringUtils.utf8ToString( credentials) )
+ .append( StringTools.utf8ToString( credentials) )
.append('/')
- .append( StringUtils.dumpBytes( credentials ) )
+ .append( StringTools.dumpBytes( credentials ) )
.append( "'\n" );
}
else
@@ -329,9 +329,9 @@
.append( "'\n" );
sb.append( " Credentials : '" )
- .append( StringUtils.utf8ToString( credentials) )
+ .append( StringTools.utf8ToString( credentials) )
.append('/')
- .append( StringUtils.dumpBytes( credentials ) )
+ .append( StringTools.dumpBytes( credentials ) )
.append( "'\n" );
}
}
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/CompareRequestImpl.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/CompareRequestImpl.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/CompareRequestImpl.java Mon Dec 26 15:05:04 2005
@@ -18,7 +18,7 @@
import java.util.Arrays;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -107,7 +107,7 @@
super.lockCheck(
"Attempt to alter attribute value of locked CompareRequest" );
- this.attrVal = StringUtils.getBytesUtf8( attrVal );
+ this.attrVal = StringTools.getBytesUtf8( attrVal );
}
/**
@@ -254,9 +254,9 @@
sb.append( " Attribute description : '" ).append( attrId ).append(
"'\n" );
sb.append( " Attribute value : '" ).
- append( StringUtils.utf8ToString( attrVal ) ).
+ append( StringTools.utf8ToString( attrVal ) ).
append( '/' ).
- append( StringUtils.dumpBytes( attrVal ) ).
+ append( StringTools.dumpBytes( attrVal ) ).
append( "'\n" );
return sb.toString();
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ExtendedRequestImpl.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ExtendedRequestImpl.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ExtendedRequestImpl.java Mon Dec 26 15:05:04 2005
@@ -17,8 +17,8 @@
package org.apache.ldap.common.message;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.util.ArrayUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -199,9 +199,9 @@
if ( oid != null )
{
sb.append( " Request value : '" ).
- append( StringUtils.utf8ToString( payload ) ).
+ append( StringTools.utf8ToString( payload ) ).
append( '/' ).
- append( StringUtils.dumpBytes( payload ) ).
+ append( StringTools.dumpBytes( payload ) ).
append( "'\n" );
}
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/MessageDecoder.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/MessageDecoder.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/MessageDecoder.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/MessageDecoder.java Mon Dec 26 15:05:04 2005
@@ -18,14 +18,18 @@
import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
import org.apache.ldap.common.message.spi.Provider;
import org.apache.ldap.common.message.spi.TransformerSpi;
import org.apache.ldap.common.message.spi.ProviderDecoder;
+import org.apache.ldap.common.util.StringTools;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1.codec.stateful.DecoderMonitor;
import org.apache.asn1.codec.stateful.DecoderCallback;
import org.apache.asn1.codec.stateful.StatefulDecoder;
@@ -100,13 +104,13 @@
String binaryIds = ( String ) val;
binaries = new HashSet();
- if ( ! StringUtils.isEmpty( binaryIds ) )
+ if ( ! StringTools.isEmpty( binaryIds ) )
{
String[] binaryArray = binaryIds.split( " " );
for ( int i = 0; i < binaryArray.length; i++ )
{
- binaries.add( StringUtils.lowerCase( StringUtils.trim( binaryArray[i] ) ) );
+ binaries.add( StringTools.lowerCase( StringTools.trim( binaryArray[i] ) ) );
}
}
} // if already parsed and set as a collection use it
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ModifyRequestImpl.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ModifyRequestImpl.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/message/ModifyRequestImpl.java Mon Dec 26 15:05:04 2005
@@ -30,7 +30,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem ;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -270,7 +270,7 @@
{
if (value instanceof byte[] )
{
- String sValue = StringUtils.utf8ToString( (byte[])value );
+ String sValue = StringTools.utf8ToString( (byte[])value );
if ( attrHash0.contains( sValue ) == false )
{
@@ -359,8 +359,8 @@
if ( attributeValue instanceof byte[] )
{
- sb.append( StringUtils.utf8ToString( (byte[])attributeValue ) ).
- append( '/' ).append( StringUtils.dumpBytes( (byte[])attributeValue ) );
+ sb.append( StringTools.utf8ToString( (byte[])attributeValue ) ).
+ append( '/' ).append( StringTools.dumpBytes( (byte[])attributeValue ) );
}
else if ( attributeValue instanceof String )
{
@@ -368,7 +368,7 @@
}
else
{
- sb.append( StringUtils.dumpBytes( StringUtils.getBytesUtf8( attributeValue.toString() ) ) );
+ sb.append( StringTools.dumpBytes( StringTools.getBytesUtf8( attributeValue.toString() ) ) );
}
sb.append( "' \n" );
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/name/LdapName.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/name/LdapName.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/name/LdapName.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/name/LdapName.java Mon Dec 26 15:05:04 2005
@@ -27,13 +27,20 @@
package org.apache.ldap.common.name ;
-import org.apache.asn1.codec.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
import org.apache.ldap.common.util.NamespaceTools;
+import org.apache.ldap.common.util.StringTools;
import javax.naming.InvalidNameException;
import javax.naming.Name;
import javax.naming.NamingException;
-import java.util.*;
/**
@@ -951,9 +958,9 @@
if ( posEqual > 0 )
{
- String name = StringUtils.trim( rdn.substring( 0, posEqual ) );
+ String name = StringTools.trim( rdn.substring( 0, posEqual ) );
- if ( StringUtils.isEmpty( StringUtils.lowerCase( name ) ) == false )
+ if ( StringTools.isEmpty( StringTools.lowerCase( name ) ) == false )
{
String oid = (String)oids.get( name );
Modified: directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/util/AttributeUtils.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/util/AttributeUtils.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/util/AttributeUtils.java (original)
+++ directory/shared/ldap/trunk/common/src/main/java/org/apache/ldap/common/util/AttributeUtils.java Mon Dec 26 15:05:04 2005
@@ -17,7 +17,6 @@
package org.apache.ldap.common.util;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.ldap.common.message.LockableAttributeImpl;
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.Normalizer;
@@ -254,11 +253,11 @@
}
else if (attr instanceof byte[] )
{
- String string = StringUtils.utf8ToString( (byte[])attr );
+ String string = StringTools.utf8ToString( (byte[])attr );
sb.append( tabs ).append( " Val[" ).append( j ).append( "] : " );
sb.append( string ).append( '/');
- sb.append( StringUtils.dumpBytes( (byte[]) attr ) );
+ sb.append( StringTools.dumpBytes( (byte[]) attr ) );
sb.append( " \n" );
}
else
Modified: directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/filter/FilterParserImplTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/filter/FilterParserImplTest.java?rev=359122&r1=359121&r2=359122&view=diff
==============================================================================
--- directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/filter/FilterParserImplTest.java (original)
+++ directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/filter/FilterParserImplTest.java Mon Dec 26 15:05:04 2005
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.text.ParseException;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.TestCase;
@@ -179,7 +179,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( ou :dn :stupidMatch := dummyAssertion\\23\\ac )" );
assertEquals( "ou", node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "stupidMatch", node.getMatchingRuleId() );
assertTrue( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -190,7 +190,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( 1.2.3.4 :dn :1.3434.23.2 := dummyAssertion\\23\\ac )" );
assertEquals( "1.2.3.4", node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "1.3434.23.2", node.getMatchingRuleId() );
assertTrue( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -201,7 +201,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( ou :stupidMatch := dummyAssertion\\23\\ac )" );
assertEquals( "ou", node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "stupidMatch", node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -228,7 +228,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( ou := dummyAssertion\\23\\ac )" );
assertEquals( "ou", node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( null, node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -239,7 +239,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( 1.2.3.4 :1.3434.23.2 := dummyAssertion\\23\\ac )" );
assertEquals( "1.2.3.4", node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "1.3434.23.2", node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -250,7 +250,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( :dn :stupidMatch := dummyAssertion\\23\\ac )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "stupidMatch", node.getMatchingRuleId() );
assertTrue( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -277,7 +277,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( :dn :1.3434.23.2 := dummyAssertion\\23\\ac )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "1.3434.23.2", node.getMatchingRuleId() );
assertTrue( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -288,7 +288,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( :stupidMatch := dummyAssertion\\23\\ac )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "stupidMatch", node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -299,7 +299,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( :1.3434.23.2 := dummyAssertion\\23\\ac )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( "1.3434.23.2", node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -310,7 +310,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( := dummyAssertion )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion", StringTools.utf8ToString( node.getValue() ) );
assertEquals( null, node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );
@@ -321,7 +321,7 @@
{
ExtensibleNode node = ( ExtensibleNode ) parser.parse( "( := dummyAssertion\\23\\ac )" );
assertEquals( null, node.getAttribute() );
- assertEquals( "dummyAssertion\\23\\ac", StringUtils.utf8ToString( node.getValue() ) );
+ assertEquals( "dummyAssertion\\23\\ac", StringTools.utf8ToString( node.getValue() ) );
assertEquals( null, node.getMatchingRuleId() );
assertFalse( node.dnAttributes() );
assertEquals( AbstractExprNode.EXTENSIBLE, node.getAssertionType() );