You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/12/03 14:09:56 UTC
svn commit: r351937 - in
/directory/sandbox/ersiner/apacheds-with-stored-procs/core: ./
src/main/java/org/apache/ldap/server/storedprocs/
src/main/java/org/apache/ldap/server/storedprocs/codec/
Author: ersiner
Date: Sat Dec 3 05:09:31 2005
New Revision: 351937
URL: http://svn.apache.org/viewcvs?rev=351937&view=rev
Log:
Applied Emmanuel's method name refactoring to the branch.
Upgraded version of commons-lang from 2.0 to 2.1 to be able to use primitiveTwoWrapper conversions.
Modified:
directory/sandbox/ersiner/apacheds-with-stored-procs/core/project.xml
directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/JavaStoredProcedureExtendedOperationHandler.java
directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/StoredProcedureTests.java
directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/codec/StoredProcedureGrammar.java
Modified: directory/sandbox/ersiner/apacheds-with-stored-procs/core/project.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/ersiner/apacheds-with-stored-procs/core/project.xml?rev=351937&r1=351936&r2=351937&view=diff
==============================================================================
--- directory/sandbox/ersiner/apacheds-with-stored-procs/core/project.xml (original)
+++ directory/sandbox/ersiner/apacheds-with-stored-procs/core/project.xml Sat Dec 3 05:09:31 2005
@@ -14,7 +14,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<type>jar</type>
</dependency>
<dependency>
Modified: directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/JavaStoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/JavaStoredProcedureExtendedOperationHandler.java?rev=351937&r1=351936&r2=351937&view=diff
==============================================================================
--- directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/JavaStoredProcedureExtendedOperationHandler.java (original)
+++ directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/JavaStoredProcedureExtendedOperationHandler.java Sat Dec 3 05:09:31 2005
@@ -56,7 +56,7 @@
ParameterPojo pPojo = ( ParameterPojo ) it.next();
// get type from String even if it holds a primitive type name
- Class type = SpringClassUtils.forName( StringUtils.toUtf8( pPojo.getType() ) );
+ Class type = SpringClassUtils.forName( StringUtils.utf8ToString( pPojo.getType() ) );
types.add( type );
@@ -106,7 +106,7 @@
// TODO determine what to do with the exception
ctx.executeProcedure(
- StringUtils.toUtf8( pojo.getProcedure() ),
+ StringUtils.utf8ToString( pojo.getProcedure() ),
( Class[] ) types.toArray(),
values.toArray()
);
@@ -120,7 +120,7 @@
instance = org.apache.commons.lang.ClassUtils
.primitiveToWrapper( type )
.getConstructor( new Class[] {String.class} )
- .newInstance( new Object[] { StringUtils.toUtf8( value ) } );
+ .newInstance( new Object[] { StringUtils.utf8ToString( value ) } );
}
catch (IllegalArgumentException e)
{
Modified: directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/StoredProcedureTests.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/StoredProcedureTests.java?rev=351937&r1=351936&r2=351937&view=diff
==============================================================================
--- directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/StoredProcedureTests.java (original)
+++ directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/StoredProcedureTests.java Sat Dec 3 05:09:31 2005
@@ -82,26 +82,26 @@
// Check the decoded message
Assert.assertEquals( "execute", StringUtils
- .toUtf8( pojo.getProcedure() ) );
+ .utf8ToString( pojo.getProcedure() ) );
Assert.assertNotNull( pojo.getParameters() );
Assert.assertEquals( 3, pojo.getParameters().size() );
ParameterPojo param = ( ParameterPojo ) pojo.getParameters().get( 0 );
- Assert.assertEquals( "int", StringUtils.toUtf8( param.getType() ) );
+ Assert.assertEquals( "int", StringUtils.utf8ToString( param.getType() ) );
Assert.assertEquals( 1, param.getValue()[0] );
param = ( ParameterPojo ) pojo.getParameters().get( 1 );
- Assert.assertEquals( "boolean", StringUtils.toUtf8( param.getType() ) );
- Assert.assertEquals( "true", StringUtils.toUtf8( param.getValue() ) );
+ Assert.assertEquals( "boolean", StringUtils.utf8ToString( param.getType() ) );
+ Assert.assertEquals( "true", StringUtils.utf8ToString( param.getValue() ) );
param = ( ParameterPojo ) pojo.getParameters().get( 2 );
- Assert.assertEquals( "String", StringUtils.toUtf8( param.getType() ) );
+ Assert.assertEquals( "String", StringUtils.utf8ToString( param.getType() ) );
Assert.assertEquals( "parameter3", StringUtils
- .toUtf8( param.getValue() ) );
+ .utf8ToString( param.getValue() ) );
// Unrelated Stuff...
try
Modified: directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/codec/StoredProcedureGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/codec/StoredProcedureGrammar.java?rev=351937&r1=351936&r2=351937&view=diff
==============================================================================
--- directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/codec/StoredProcedureGrammar.java (original)
+++ directory/sandbox/ersiner/apacheds-with-stored-procs/core/src/main/java/org/apache/ldap/server/storedprocs/codec/StoredProcedureGrammar.java Sat Dec 3 05:09:31 2005
@@ -123,7 +123,7 @@
else
{
// Only this field's type is String by default
- String language = StringUtils.toUtf8( tlv.getValue().getData() );
+ String language = StringUtils.utf8ToString( tlv.getValue().getData() );
storedProcedurePojo = new StoredProcedurePojo();