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/03 13:13:40 UTC
svn commit: r351913 - in /directory/shared/ldap/trunk/apache2-provider/src:
main/java/org/apache/asn1new/ldap/codec/grammar/
main/java/org/apache/asn1new/ldap/pojo/ test/org/apache/asn1new/ldap/codec/
Author: elecharny
Date: Sat Dec 3 04:12:16 2005
New Revision: 351913
URL: http://svn.apache.org/viewcvs?rev=351913&view=rev
Log:
Fixed DirSnickers-116 :
- The toUtf8() method has been renamed to Utf8ToString()
- Javadoc correctd for getBytesUtf8 method
Modified:
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java
directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java
directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/AddRequestGrammar.java Sat Dec 3 04:12:16 2005
@@ -348,7 +348,7 @@
}
else
{
- value = StringUtils.toUtf8( tlv.getValue().getData() );
+ value = StringUtils.Utf8ToString( tlv.getValue().getData() );
if ( log.isDebugEnabled() )
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/CompareRequestGrammar.java Sat Dec 3 04:12:16 2005
@@ -277,7 +277,7 @@
}
else
{
- compareRequest.setAssertionValue( StringUtils.toUtf8( tlv.getValue().getData() ) );
+ compareRequest.setAssertionValue( StringUtils.Utf8ToString( tlv.getValue().getData() ) );
if ( log.isDebugEnabled() )
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/FilterGrammar.java Sat Dec 3 04:12:16 2005
@@ -500,7 +500,7 @@
}
else
{
- assertion.setAssertionValue( StringUtils.toUtf8( (byte[])assertionValue ) );
+ assertion.setAssertionValue( StringUtils.Utf8ToString( (byte[])assertionValue ) );
}
// We now have to get back to the nearest filter which is not terminal.
@@ -1206,7 +1206,7 @@
// Store the value.
ExtensibleMatchFilter extensibleMatchFilter = (ExtensibleMatchFilter)searchRequest.getCurrentFilter();
- extensibleMatchFilter.setMatchValue( StringUtils.toUtf8( tlv.getValue().getData() ) );
+ extensibleMatchFilter.setMatchValue( StringUtils.Utf8ToString( tlv.getValue().getData() ) );
}
});
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/LdapControlGrammar.java Sat Dec 3 04:12:16 2005
@@ -194,7 +194,7 @@
// The OID is encoded as a String, not an Object Id
try
{
- new OID( StringUtils.toUtf8( tlv.getValue().getData() ) );
+ new OID( StringUtils.Utf8ToString( tlv.getValue().getData() ) );
}
catch ( DecoderException de )
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/grammar/SearchResultEntryGrammar.java Sat Dec 3 04:12:16 2005
@@ -366,7 +366,7 @@
}
else
{
- value = StringUtils.toUtf8( tlv.getValue().getData() );
+ value = StringUtils.Utf8ToString( tlv.getValue().getData() );
if ( log.isDebugEnabled() )
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java Sat Dec 3 04:12:16 2005
@@ -550,7 +550,7 @@
if ( attributeValue instanceof String )
{
- sb.append( StringUtils.toUtf8( (byte[])attributeValue ) ).append( "' \n" );
+ sb.append( StringUtils.Utf8ToString( (byte[])attributeValue ) ).append( "' \n" );
}
else
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java Sat Dec 3 04:12:16 2005
@@ -85,7 +85,7 @@
Assert.assertEquals( 3, br.getVersion() );
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
- Assert.assertEquals( "password", StringUtils.toUtf8( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ Assert.assertEquals( "password", StringUtils.Utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
// Check the length
Assert.assertEquals(0x35, message.computeLength());
@@ -198,7 +198,7 @@
Assert.assertEquals( 3, br.getVersion() );
Assert.assertEquals( "", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
- Assert.assertEquals( "password", StringUtils.toUtf8( ( (SimpleAuthentication)br.getAuthentication() ).getSimple() ) );
+ Assert.assertEquals( "password", StringUtils.Utf8ToString( ( (SimpleAuthentication)br.getAuthentication() ).getSimple() ) );
// Check the length
Assert.assertEquals(0x16, message.computeLength());
@@ -352,7 +352,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslCredentials ) );
Assert.assertEquals( "KERBEROS_V4", ( ( SaslCredentials ) br.getAuthentication() ).getMechanism() );
- Assert.assertEquals( "abcdef", StringUtils.toUtf8( ( ( SaslCredentials ) br.getAuthentication() ).getCredentials() ) );
+ Assert.assertEquals( "abcdef", StringUtils.Utf8ToString( ( ( SaslCredentials ) br.getAuthentication() ).getCredentials() ) );
// Check the length
Assert.assertEquals(0x40, message.computeLength());
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java Sat Dec 3 04:12:16 2005
@@ -157,7 +157,7 @@
Assert.assertEquals( 0, br.getLdapResult().getResultCode() );
Assert.assertEquals( "", br.getLdapResult().getMatchedDN() );
Assert.assertEquals( "", br.getLdapResult().getErrorMessage() );
- Assert.assertEquals( "AB", StringUtils.toUtf8( br.getServerSaslCreds() ) );
+ Assert.assertEquals( "AB", StringUtils.Utf8ToString( br.getServerSaslCreds() ) );
// Check the length
Assert.assertEquals(0x12, message.computeLength());
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java Sat Dec 3 04:12:16 2005
@@ -82,7 +82,7 @@
Assert.assertEquals( 1, message.getMessageId() );
Assert.assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
- Assert.assertEquals( "value", StringUtils.toUtf8( extendedRequest.getRequestValue() ) );
+ Assert.assertEquals( "value", StringUtils.Utf8ToString( extendedRequest.getRequestValue() ) );
// Check the length
Assert.assertEquals(0x16, message.computeLength());
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java Sat Dec 3 04:12:16 2005
@@ -93,7 +93,7 @@
Assert.assertEquals( "", extendedResponse.getLdapResult().getMatchedDN() );
Assert.assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
Assert.assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
- Assert.assertEquals( "value", StringUtils.toUtf8( (byte[])extendedResponse.getResponse() ) );
+ Assert.assertEquals( "value", StringUtils.Utf8ToString( (byte[])extendedResponse.getResponse() ) );
// Check the length
Assert.assertEquals(0x1D, message.computeLength());
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java Sat Dec 3 04:12:16 2005
@@ -91,7 +91,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
Assert.assertEquals( "password",
- StringUtils.toUtf8( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ StringUtils.Utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
}
/**
@@ -217,7 +217,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
Assert.assertEquals( "password",
- StringUtils.toUtf8( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ StringUtils.Utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
}
/**
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java?rev=351913&r1=351912&r2=351913&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java Sat Dec 3 04:12:16 2005
@@ -148,7 +148,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.toUtf8( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringUtils.Utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );
@@ -282,7 +282,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.toUtf8( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringUtils.Utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );
@@ -435,7 +435,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.toUtf8( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringUtils.Utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );