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 2016/03/24 00:28:29 UTC
svn commit: r1736388 [6/6] - in /directory/shared/branches/shared-value:
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/
dsml/parser/src/main/java/org/apache/directory/api/ds...
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java Wed Mar 23 23:28:28 2016
@@ -33,7 +33,7 @@ import java.util.List;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.ldap.model.entry.StringValue;
+import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.filter.AndNode;
import org.apache.directory.api.ldap.model.filter.ApproximateNode;
import org.apache.directory.api.ldap.model.filter.BranchNode;
@@ -620,7 +620,7 @@ public class FilterParserTest
assertTrue( node instanceof SubstringNode );
assertEquals( 4, node.getAny().size() );
- assertFalse( node.getAny().contains( new StringValue( "" ) ) );
+ assertFalse( node.getAny().contains( new Value( "" ) ) );
assertTrue( node.getAny().contains( "e" ) );
assertTrue( node.getAny().contains( "b" ) );
assertTrue( node.getAny().contains( "c" ) );
@@ -662,7 +662,7 @@ public class FilterParserTest
assertTrue( node instanceof SubstringNode );
assertEquals( 4, node.getAny().size() );
- assertFalse( node.getAny().contains( new StringValue( "" ) ) );
+ assertFalse( node.getAny().contains( new Value( "" ) ) );
assertTrue( node.getAny().contains( "e" ) );
assertTrue( node.getAny().contains( "b" ) );
assertTrue( node.getAny().contains( "c" ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/CompareRequestImplTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/CompareRequestImplTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/CompareRequestImplTest.java Wed Mar 23 23:28:28 2016
@@ -191,7 +191,7 @@ public class CompareRequestImplTest
{
CompareRequest req0 = new CompareRequest()
{
- public Value<?> getAssertionValue()
+ public Value getAssertionValue()
{
return null;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java Wed Mar 23 23:28:28 2016
@@ -23,7 +23,6 @@ package org.apache.directory.api.ldap.mo
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.schema.normalizers.BooleanNormalizer;
import org.apache.directory.api.util.Strings;
@@ -50,7 +49,7 @@ public class BooleanNormalizerTest
@Test
public void testNormalizeNullValue() throws Exception
{
- assertNull( normalizer.normalize( ( Value<?> ) null ) );
+ assertNull( normalizer.normalize( ( Value ) null ) );
}
@@ -73,8 +72,8 @@ public class BooleanNormalizerTest
@Test
public void testNormalizeByteValue() throws Exception
{
- assertEquals( "TRUE", normalizer.normalize( new BinaryValue( Strings.getBytesUtf8( "tRuE" ) ) ).getString() );
- assertEquals( "TRUE", normalizer.normalize( new BinaryValue( Strings.getBytesUtf8( "true" ) ) ).getString() );
+ assertEquals( "TRUE", normalizer.normalize( new Value( Strings.getBytesUtf8( "tRuE" ) ) ).getString() );
+ assertEquals( "TRUE", normalizer.normalize( new Value( Strings.getBytesUtf8( "true" ) ) ).getString() );
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java Wed Mar 23 23:28:28 2016
@@ -21,7 +21,6 @@ package org.apache.directory.api.ldap.mo
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
-import org.apache.directory.api.ldap.model.entry.StringValue;
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.schema.Normalizer;
@@ -49,16 +48,16 @@ public class DummyNormalizer extends Nor
/**
* {@inheritDoc}
*/
- public Value<?> normalize( Value<?> value ) throws LdapException
+ public Value normalize( Value value ) throws LdapException
{
String str = value.getString();
if ( Strings.isEmpty( str ) )
{
- return new StringValue( str );
+ return new Value( str );
}
- return new StringValue( str );
+ return new Value( str );
}
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java Wed Mar 23 23:28:28 2016
@@ -74,7 +74,7 @@ public class AttributeClassLoader extend
{
byte[] classBytes = null;
- Value<?> value = attribute.get();
+ Value value = attribute.get();
if ( value.isHumanReadable() )
{
Modified: directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java Wed Mar 23 23:28:28 2016
@@ -34,7 +34,6 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.model.constants.MetaSchemaConstants;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.Value;
@@ -255,7 +254,7 @@ public class SchemaEntityFactory impleme
Set<String> depsSet = new HashSet<String>();
Attribute depsAttr = entry.get( MetaSchemaConstants.M_DEPENDENCIES_AT );
- for ( Value<?> value : depsAttr )
+ for ( Value value : depsAttr )
{
depsSet.add( value.getString() );
}
@@ -907,7 +906,7 @@ public class SchemaEntityFactory impleme
List<String> strings = new ArrayList<String>( attr.size() );
- for ( Value<?> value : attr )
+ for ( Value value : attr )
{
strings.add( value.getString() );
}
@@ -1184,17 +1183,9 @@ public class SchemaEntityFactory impleme
*/
private String getStringValue( Attribute attribute )
{
- Value<?> value = attribute.get();
+ Value value = attribute.get();
- if ( value instanceof BinaryValue )
- {
- // We have to transform the value to a String
- return Strings.utf8ToString( value.getBytes() );
- }
- else
- {
- return value.getString();
- }
+ return value.getString();
}
@@ -1237,7 +1228,7 @@ public class SchemaEntityFactory impleme
{
List<String> values = new ArrayList<String>();
- for ( Value<?> name : names )
+ for ( Value name : names )
{
values.add( name.getString() );
}
Modified: directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java (original)
+++ directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java Wed Mar 23 23:28:28 2016
@@ -2326,4 +2326,76 @@ public final class Strings
return ( int ) res;
}
+
+
+ /**
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ */
+ public static int compare( byte[] b1, byte[] b2 )
+ {
+ if ( LOG.isDebugEnabled() )
+ {
+ LOG.debug( "comparing OctetString objects '{}' with '{}'",
+ Strings.dumpBytes( b1 ), Strings.dumpBytes( b2 ) );
+ }
+
+ // -------------------------------------------------------------------
+ // Handle some basis cases
+ // -------------------------------------------------------------------
+
+ if ( b1 == null )
+ {
+ return ( b2 == null ) ? 0 : -1;
+ }
+
+ if ( b2 == null )
+ {
+ return 1;
+ }
+
+ if ( b1.length == b2.length )
+ {
+ for ( int i = 0; i < b1.length; i++ )
+ {
+ if ( b1[i] > b2[i] )
+ {
+ return 1;
+ }
+ else if ( b1[i] < b2[i] )
+ {
+ return -1;
+ }
+ }
+
+ return 0;
+ }
+
+ int minLength = Math.min( b1.length, b2.length );
+
+ for ( int i = 0; i < minLength; i++ )
+ {
+ if ( b1[i] > b2[i] )
+ {
+ return 1;
+ }
+ else if ( b1[i] < b2[i] )
+ {
+ return -1;
+ }
+ }
+
+ // b2 is longer w/ b1 as prefix
+ if ( b1.length == minLength )
+ {
+ return -1;
+ }
+
+ // b1 is longer w/ b2 as prefix
+ if ( b2.length == minLength )
+ {
+ return 1;
+ }
+
+ return 0;
+ }
}