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 [1/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...
Author: elecharny
Date: Wed Mar 23 23:28:28 2016
New Revision: 1736388
URL: http://svn.apache.org/viewvc?rev=1736388&view=rev
Log:
Refactoring : the AbstractValue, StringValue and BinaryValue classes have been removed and replaced by a single Value class
Removed:
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AbstractValue.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/BinaryValue.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java
Modified:
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AttributeValueAssertion.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addRequest/AddRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapModelOsgiTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeSerializationTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareEntryTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareValueSerializationTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdifAnonymizer.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/LdapConnectionTemplate.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactory.java
directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/template/ModelFactoryImpl.java
directory/shared/branches/shared-value/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/LdifAnonymizerTest.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/AttributeValueAssertion.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitAssertionValueFilter.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/StoreMatchValue.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/AddRequestDecorator.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/CompareRequestDecorator.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/ModifyRequestDecorator.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchRequestDecorator.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/decorators/SearchResultEntryDecorator.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/AttributeValueAssertionFilter.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/search/ExtensibleMatchFilter.java
directory/shared/branches/shared-value/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/add/AddRequestTest.java
directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g
directory/shared/branches/shared-value/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/UserClass_NameTest.java
directory/shared/branches/shared-value/ldap/model/src/main/antlr/distinguishedName.g
directory/shared/branches/shared-value/ldap/model/src/main/antlr/subtree-specification.g
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Attribute.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/AttributeUtils.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultAttribute.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultModification.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Value.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/AbstractExprNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ApproximateNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/EqualityNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ExtensibleNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/FilterParser.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/GreaterEqNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/LessEqNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SimpleNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/SubstringNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifEntry.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/Anonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/BinaryAnonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/CaseSensitiveStringAnonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/IntegerAnonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/StringAnonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/anonymizer/TelephoneNumberAnonymizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/AddRequestImpl.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequest.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/CompareRequestImpl.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Ava.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/FastDnParser.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/Normalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ByteArrayComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DefaultStringNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DnNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NoOpNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/UniqueMemberNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/AbstractSchemaLoader.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeUtilsTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueAttributeTypeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/StringValueTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterNodeEqualityTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterParserTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/CompareRequestImplTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizerTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DummyNormalizer.java
directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/AttributeClassLoader.java
directory/shared/branches/shared-value/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/loader/SchemaEntityFactory.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java Wed Mar 23 23:28:28 2016
@@ -36,8 +36,7 @@ import org.apache.directory.api.dsmlv2.r
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.CodecControl;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-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.ldif.LdifUtils;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.util.Base64;
@@ -151,11 +150,11 @@ public final class ParserUtils
*/
public static boolean needsBase64Encoding( Object value )
{
- if ( value instanceof StringValue )
+ if ( value instanceof Value )
{
return false;
}
- else if ( value instanceof BinaryValue )
+ else if ( value instanceof Value )
{
return false;
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java Wed Mar 23 23:28:28 2016
@@ -118,7 +118,7 @@ public class AddRequestDsml
*
* @param value The value to add
*/
- public void addAttributeValue( Value<?> value ) throws LdapException
+ public void addAttributeValue( Value value ) throws LdapException
{
currentAttribute.add( value );
}
@@ -166,7 +166,7 @@ public class AddRequestDsml
Element attributeElement = element.addElement( "attr" );
attributeElement.addAttribute( "name", attribute.getId() );
// Looping on Values
- for ( Value<?> value : attribute )
+ for ( Value value : attribute )
{
if ( ParserUtils.needsBase64Encoding( value.getValue() ) )
{
@@ -218,9 +218,9 @@ public class AddRequestDsml
*/
public void addAttributeValue( Object value ) throws LdapException
{
- if ( value instanceof Value<?> )
+ if ( value instanceof Value )
{
- ( ( AddRequestDsml ) getDecorated() ).addAttributeValue( ( Value<?> ) value );
+ ( ( AddRequestDsml ) getDecorated() ).addAttributeValue( ( Value ) value );
}
else if ( value instanceof String )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AttributeValueAssertion.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AttributeValueAssertion.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AttributeValueAssertion.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AttributeValueAssertion.java Wed Mar 23 23:28:28 2016
@@ -21,8 +21,6 @@ package org.apache.directory.api.dsmlv2.
import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-import org.apache.directory.api.ldap.model.entry.StringValue;
import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.util.Strings;
@@ -50,7 +48,7 @@ public class AttributeValueAssertion
private String attributeDesc;
/** The assertion value */
- private Value<?> assertionValue;
+ private Value assertionValue;
/**
@@ -71,13 +69,9 @@ public class AttributeValueAssertion
{
return Strings.dumpBytes( ( byte[] ) object );
}
- else if ( object instanceof StringValue )
+ else if ( object instanceof Value )
{
- return ( ( StringValue ) object ).getValue();
- }
- else if ( object instanceof BinaryValue )
- {
- return Strings.dumpBytes( ( ( BinaryValue ) object ).getValue() );
+ return ( ( Value ) object ).getValue();
}
else
{
@@ -99,7 +93,7 @@ public class AttributeValueAssertion
*
* @return Returns the assertionValue.
*/
- public Value<?> getAssertionValue()
+ public Value getAssertionValue()
{
return assertionValue;
}
@@ -110,7 +104,7 @@ public class AttributeValueAssertion
*
* @param assertionValue The assertionValue to set.
*/
- public void setAssertionValue( Value<?> assertionValue )
+ public void setAssertionValue( Value assertionValue )
{
this.assertionValue = assertionValue;
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/CompareRequestDsml.java Wed Mar 23 23:28:28 2016
@@ -218,7 +218,7 @@ public class CompareRequestDsml
/**
* {@inheritDoc}
*/
- public Value<?> getAssertionValue()
+ public Value getAssertionValue()
{
return getDecorated().getAssertionValue();
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java Wed Mar 23 23:28:28 2016
@@ -44,8 +44,6 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-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.exception.LdapInvalidDnException;
@@ -2745,12 +2743,12 @@ public final class Dsmlv2Grammar extends
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- Value<byte[]> value = new BinaryValue( Base64.decode( nextText.trim().toCharArray() ) );
+ Value value = new Value( Base64.decode( nextText.trim().toCharArray() ) );
assertion.setAssertionValue( value );
}
else
{
- Value<String> value = new StringValue( nextText.trim() );
+ Value value = new Value( nextText.trim() );
assertion.setAssertionValue( value );
}
}
@@ -2917,11 +2915,11 @@ public final class Dsmlv2Grammar extends
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- filter.setMatchValue( new BinaryValue( Base64.decode( nextText.trim().toCharArray() ) ) );
+ filter.setMatchValue( new Value( Base64.decode( nextText.trim().toCharArray() ) ) );
}
else
{
- filter.setMatchValue( new StringValue( nextText.trim() ) );
+ filter.setMatchValue( new Value( nextText.trim() ) );
}
}
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ExtensibleMatchFilter.java Wed Mar 23 23:28:28 2016
@@ -19,6 +19,7 @@
*/
package org.apache.directory.api.dsmlv2.request;
+import org.apache.directory.api.ldap.model.entry.Value;
/**
* The search request filter Matching Rule assertion
@@ -34,7 +35,7 @@ public class ExtensibleMatchFilter exten
private String type;
/** Matching rule value */
- private org.apache.directory.api.ldap.model.entry.Value<?> matchValue;
+ private org.apache.directory.api.ldap.model.entry.Value matchValue;
/** The dnAttributes flag */
private boolean dnAttributes = false;
@@ -89,7 +90,7 @@ public class ExtensibleMatchFilter exten
*
* @return Returns the matchValue.
*/
- public org.apache.directory.api.ldap.model.entry.Value<?> getMatchValue()
+ public Value getMatchValue()
{
return matchValue;
}
@@ -100,7 +101,7 @@ public class ExtensibleMatchFilter exten
*
* @param matchValue The matchValue to set.
*/
- public void setMatchValue( org.apache.directory.api.ldap.model.entry.Value<?> matchValue )
+ public void setMatchValue( Value matchValue )
{
this.matchValue = matchValue;
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ModifyRequestDsml.java Wed Mar 23 23:28:28 2016
@@ -162,7 +162,7 @@ public class ModifyRequestDsml
{
modElement.addAttribute( "name", modification.getAttribute().getId() );
- for ( Value<?> value : modification.getAttribute() )
+ for ( Value value : modification.getAttribute() )
{
if ( value.getValue() != null )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java Wed Mar 23 23:28:28 2016
@@ -196,8 +196,7 @@ public class SearchRequestDsml
* @param filter The filter to be transformed
* @return An ExprNode
*/
- @SuppressWarnings(
- { "unchecked", "rawtypes" })
+ @SuppressWarnings({ "rawtypes" })
private ExprNode transform( Filter filter )
{
if ( filter != null )
@@ -309,7 +308,7 @@ public class SearchRequestDsml
ExtensibleMatchFilter extFilter = ( ExtensibleMatchFilter ) filter;
String matchingRule = null;
- Value<?> value = extFilter.getMatchValue();
+ Value value = extFilter.getMatchValue();
if ( extFilter.getMatchingRule() != null )
{
@@ -538,7 +537,7 @@ public class SearchRequestDsml
String attributeName = ( ( SimpleNode<?> ) filter ).getAttribute();
newElement.addAttribute( NAME, attributeName );
- Value<?> value = ( ( SimpleNode<?> ) filter ).getValue();
+ Value value = ( ( SimpleNode<?> ) filter ).getValue();
if ( value != null )
{
if ( ParserUtils.needsBase64Encoding( value ) )
@@ -573,7 +572,7 @@ public class SearchRequestDsml
{
Element newElement = element.addElement( "extensibleMatch" );
- Value<?> value = ( ( ExtensibleNode ) filter ).getValue();
+ Value value = ( ( ExtensibleNode ) filter ).getValue();
if ( value != null )
{
if ( ParserUtils.needsBase64Encoding( value ) )
Modified: directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/SearchResultEntryDsml.java Wed Mar 23 23:28:28 2016
@@ -147,7 +147,7 @@ public class SearchResultEntryDsml
Element attributeElement = element.addElement( "attr" );
attributeElement.addAttribute( "name", attribute.getUpId() );
- for ( Value<?> value : attribute )
+ for ( Value value : attribute )
{
if ( ParserUtils.needsBase64Encoding( value.getValue() ) )
{
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addRequest/AddRequestTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addRequest/AddRequestTest.java Wed Mar 23 23:28:28 2016
@@ -334,7 +334,7 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertFalse( valueIterator.hasNext() );
}
@@ -371,7 +371,7 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertFalse( valueIterator.hasNext() );
}
@@ -408,9 +408,9 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "top", value.getString() );
}
@@ -447,9 +447,9 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertFalse( value.isHumanReadable() );
assertEquals( "DSMLv2.0 rocks!!", value.getString() );
}
@@ -487,9 +487,9 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "top", value.getString() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
@@ -540,9 +540,9 @@ public class AddRequestTest extends Abst
assertEquals( "objectclass", attribute.getUpId() );
// Getting the Value
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "top", value.getString() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Wed Mar 23 23:28:28 2016
@@ -390,9 +390,9 @@ public class SearchResultEntryTest exten
Attribute attribute = attributeIterator.next();
assertEquals( "dc", attribute.getUpId() );
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "example", value.getString() );
}
@@ -430,9 +430,9 @@ public class SearchResultEntryTest exten
assertEquals( "cn", attribute.getUpId() );
assertEquals( 1, attribute.size() );
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
String expected = new String( new byte[]
{ 'E', 'm', 'm', 'a', 'n', 'u', 'e', 'l', ' ', 'L', ( byte ) 0xc3, ( byte ) 0xa9, 'c', 'h', 'a', 'r', 'n',
@@ -474,9 +474,9 @@ public class SearchResultEntryTest exten
assertEquals( "dc", attribute.getUpId() );
assertEquals( 1, attribute.size() );
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "", value.getString() );
}
@@ -514,9 +514,9 @@ public class SearchResultEntryTest exten
assertEquals( "objectclass", attribute.getUpId() );
assertEquals( 2, attribute.size() );
- Iterator<Value<?>> valueIterator = attribute.iterator();
+ Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "top", value.getString() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
@@ -556,9 +556,9 @@ public class SearchResultEntryTest exten
Attribute objectClassAttribute = entry.get( "objectclass" );
assertEquals( 1, objectClassAttribute.size() );
- Iterator<Value<?>> valueIterator = objectClassAttribute.iterator();
+ Iterator<Value> valueIterator = objectClassAttribute.iterator();
assertTrue( valueIterator.hasNext() );
- Value<?> value = valueIterator.next();
+ Value value = valueIterator.next();
assertEquals( "top", value.getString() );
assertFalse( valueIterator.hasNext() );
Modified: directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapModelOsgiTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapModelOsgiTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapModelOsgiTest.java (original)
+++ directory/shared/branches/shared-value/integ-osgi/src/test/java/org/apache/directory/api/osgi/ApiLdapModelOsgiTest.java Wed Mar 23 23:28:28 2016
@@ -23,7 +23,7 @@ package org.apache.directory.api.osgi;
import org.apache.directory.api.ldap.model.entry.AttributeUtils;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
-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.EqualityNode;
import org.apache.directory.api.ldap.model.message.BindRequestImpl;
import org.apache.directory.api.ldap.model.name.Dn;
@@ -49,7 +49,7 @@ public class ApiLdapModelOsgiTest extend
{
new Dn( "dc=example,dc=com" ); // uses FastDnParser
new Dn( "cn=a+sn=b,dc=example,dc=com" ); // uses ComplexDnparser (antlr based)
- new StringValue( "foo" );
+ new Value( "foo" );
new DefaultAttribute( "cn" );
new DefaultEntry();
@@ -57,7 +57,7 @@ public class ApiLdapModelOsgiTest extend
new BindRequestImpl();
- new EqualityNode<String>( "cn", new StringValue( "foo" ) );
+ new EqualityNode<String>( "cn", new Value( "foo" ) );
new LdapUrl( "ldap://ldap.example.com:10389/dc=example,dc=com?objectclass" );
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeSerializationTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeSerializationTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeSerializationTest.java Wed Mar 23 23:28:28 2016
@@ -71,7 +71,7 @@ public class SchemaAwareAttributeSeriali
@Test
- public void testEntryAttributeNoStringValueSerialization() throws IOException, ClassNotFoundException,
+ public void testEntryAttributeNoValueSerialization() throws IOException, ClassNotFoundException,
LdapInvalidAttributeValueException
{
Attribute attribute1 = new DefaultAttribute( cn );
@@ -95,7 +95,7 @@ public class SchemaAwareAttributeSeriali
@Test
- public void testEntryAttributeOneStringValueSerialization() throws IOException, ClassNotFoundException,
+ public void testEntryAttributeOneValueSerialization() throws IOException, ClassNotFoundException,
LdapInvalidAttributeValueException
{
Attribute attribute1 = new DefaultAttribute( "CommonName", cn, "test" );
@@ -120,7 +120,7 @@ public class SchemaAwareAttributeSeriali
@Test
- public void testEntryAttributeManyStringValuesSerialization() throws IOException, ClassNotFoundException,
+ public void testEntryAttributeManyValuesSerialization() throws IOException, ClassNotFoundException,
LdapInvalidAttributeValueException
{
Attribute attribute1 = new DefaultAttribute( "CN", cn, "test1", "test2", "test3" );
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareAttributeTest.java Wed Mar 23 23:28:28 2016
@@ -39,9 +39,7 @@ import java.util.Iterator;
import java.util.Set;
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.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.exception.LdapInvalidAttributeValueException;
@@ -82,8 +80,8 @@ public class SchemaAwareAttributeTest
// A String attribute which allows null value
private AttributeType atEMail;
- private final Value<String> nullStringValue = new StringValue( ( String ) null );
- private final Value<byte[]> nullBinaryValue = new BinaryValue( ( byte[] ) null );
+ private final Value nullStringValue = new Value( ( String ) null );
+ private final Value nullBinaryValue = new Value( ( byte[] ) null );
private static final byte[] BYTES1 = new byte[]
{ 'a', 'b' };
private static final byte[] BYTES2 = new byte[]
@@ -93,15 +91,15 @@ public class SchemaAwareAttributeTest
private static final byte[] BYTES4 = new byte[]
{ 'd' };
- private final StringValue stringValue1 = new StringValue( "a" );
- private final StringValue stringValue2 = new StringValue( "b" );
- private final StringValue stringValue3 = new StringValue( "c" );
- private final StringValue stringValue4 = new StringValue( "d" );
-
- private final BinaryValue binaryValue1 = new BinaryValue( BYTES1 );
- private final BinaryValue binaryValue2 = new BinaryValue( BYTES2 );
- private final BinaryValue binaryValue3 = new BinaryValue( BYTES3 );
- private final BinaryValue binaryValue4 = new BinaryValue( BYTES4 );
+ private final Value stringValue1 = new Value( "a" );
+ private final Value stringValue2 = new Value( "b" );
+ private final Value stringValue3 = new Value( "c" );
+ private final Value stringValue4 = new Value( "d" );
+
+ private final Value binaryValue1 = new Value( BYTES1 );
+ private final Value binaryValue2 = new Value( BYTES2 );
+ private final Value binaryValue3 = new Value( BYTES3 );
+ private final Value binaryValue4 = new Value( BYTES4 );
private static SchemaManager schemaManager;
@@ -236,17 +234,17 @@ public class SchemaAwareAttributeTest
assertTrue( attr.getAttributeType().getSyntax().isHumanReadable() );
- Value<?> value = attr.get();
+ Value value = attr.get();
- assertTrue( value instanceof StringValue );
- assertEquals( "test", ( ( StringValue ) value ).getString() );
+ assertTrue( value instanceof Value );
+ assertEquals( "test", ( ( Value ) value ).getString() );
// Add a binary value
assertEquals( 0, attr.add( new byte[]
{ 0x01 } ) );
// Add a Value
- Value<?> ssv = new StringValue( at, "test2" );
+ Value ssv = new Value( at, "test2" );
attr.add( ssv );
@@ -256,7 +254,7 @@ public class SchemaAwareAttributeTest
expected.add( "test" );
expected.add( "test2" );
- for ( Value<?> val : attr )
+ for ( Value val : attr )
{
if ( expected.contains( val.getValue() ) )
{
@@ -291,7 +289,7 @@ public class SchemaAwareAttributeTest
expected.add( "test" );
expected.add( "test2" );
- for ( Value<?> val : attr )
+ for ( Value val : attr )
{
if ( expected.contains( val.getValue() ) )
{
@@ -315,16 +313,16 @@ public class SchemaAwareAttributeTest
DefaultAttribute attr = new DefaultAttribute( at );
// Add a null value
- attr.add( new StringValue( at, null ) );
+ attr.add( new Value( at, (String)null ) );
assertEquals( 1, attr.size() );
assertTrue( attr.getAttributeType().getSyntax().isHumanReadable() );
- Value<?> value = attr.get();
+ Value value = attr.get();
- assertTrue( value instanceof StringValue );
- assertNull( ( ( StringValue ) value ).getValue() );
+ assertTrue( value instanceof Value );
+ assertNull( ( ( Value ) value ).getValue() );
}
@@ -628,14 +626,14 @@ public class SchemaAwareAttributeTest
Attribute attr2 = new DefaultAttribute( atPwd );
- nbAdded = attr2.add( new BinaryValue( atPwd, null ) );
+ nbAdded = attr2.add( new Value( atPwd, ( byte[] ) null ) );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
assertEquals( nullBinaryValue, attr2.get() );
Attribute attr3 = new DefaultAttribute( atCN );
- nbAdded = attr3.add( new StringValue( atCN, "a" ), new StringValue( atCN, "b" ) );
+ nbAdded = attr3.add( new Value( atCN, "a" ), new Value( atCN, "b" ) );
assertEquals( 2, nbAdded );
assertTrue( attr3.isHumanReadable() );
assertTrue( attr3.contains( "a" ) );
@@ -643,7 +641,7 @@ public class SchemaAwareAttributeTest
Attribute attr4 = new DefaultAttribute( atCN );
- nbAdded = attr4.add( new BinaryValue( atPwd, BYTES1 ), new BinaryValue( atPwd, BYTES2 ) );
+ nbAdded = attr4.add( new Value( atPwd, BYTES1 ), new Value( atPwd, BYTES2 ) );
assertEquals( 0, nbAdded );
assertTrue( attr4.isHumanReadable() );
assertFalse( attr4.contains( BYTES1 ) );
@@ -651,7 +649,7 @@ public class SchemaAwareAttributeTest
Attribute attr5 = new DefaultAttribute( atCN );
- nbAdded = attr5.add( new StringValue( atCN, "c" ), new BinaryValue( atPwd, BYTES1 ) );
+ nbAdded = attr5.add( new Value( atCN, "c" ), new Value( atPwd, BYTES1 ) );
assertEquals( 1, nbAdded );
assertTrue( attr5.isHumanReadable() );
assertFalse( attr5.contains( "ab" ) );
@@ -659,7 +657,7 @@ public class SchemaAwareAttributeTest
Attribute attr6 = new DefaultAttribute( atPwd );
- nbAdded = attr6.add( new BinaryValue( atPwd, BYTES1 ), new StringValue( atCN, "c" ) );
+ nbAdded = attr6.add( new Value( atPwd, BYTES1 ), new Value( atCN, "c" ) );
assertEquals( 1, nbAdded );
assertFalse( attr6.isHumanReadable() );
assertTrue( attr6.contains( BYTES1 ) );
@@ -667,7 +665,7 @@ public class SchemaAwareAttributeTest
Attribute attr7 = new DefaultAttribute( atPwd );
- nbAdded = attr7.add( new BinaryValue( atPwd, null ), new StringValue( atCN, "c" ) );
+ nbAdded = attr7.add( new Value( atPwd, ( byte[] ) null ), new Value( atCN, "c" ) );
assertEquals( 1, nbAdded );
assertFalse( attr7.isHumanReadable() );
assertTrue( attr7.contains( nullBinaryValue ) );
@@ -675,7 +673,7 @@ public class SchemaAwareAttributeTest
Attribute attr8 = new DefaultAttribute( atDC );
- nbAdded = attr8.add( new StringValue( atDC, null ), new BinaryValue( atPwd, BYTES1 ) );
+ nbAdded = attr8.add( new Value( atDC, ( String ) null ), new Value( atPwd, BYTES1 ) );
assertEquals( 1, nbAdded );
assertTrue( attr8.isHumanReadable() );
assertTrue( attr8.contains( nullStringValue ) );
@@ -683,7 +681,7 @@ public class SchemaAwareAttributeTest
Attribute attr9 = new DefaultAttribute( atDC );
- nbAdded = attr9.add( new StringValue( ( String ) null ), new StringValue( "ab" ) );
+ nbAdded = attr9.add( new Value( ( String ) null ), new Value( "ab" ) );
assertEquals( 2, nbAdded );
assertTrue( attr9.isHumanReadable() );
assertTrue( attr9.contains( nullStringValue ) );
@@ -691,7 +689,7 @@ public class SchemaAwareAttributeTest
Attribute attr10 = new DefaultAttribute( atPwd );
- nbAdded = attr10.add( new BinaryValue( ( byte[] ) null ), new BinaryValue( BYTES1 ) );
+ nbAdded = attr10.add( new Value( ( byte[] ) null ), new Value( BYTES1 ) );
assertEquals( 2, nbAdded );
assertFalse( attr10.isHumanReadable() );
assertTrue( attr10.contains( nullBinaryValue ) );
@@ -1088,14 +1086,14 @@ public class SchemaAwareAttributeTest
{
Attribute attr = new DefaultAttribute( atEMail );
- Iterator<Value<?>> iterator = attr.iterator();
+ Iterator<Value> iterator = attr.iterator();
assertFalse( iterator.hasNext() );
attr.add( nullStringValue );
iterator = attr.iterator();
assertTrue( iterator.hasNext() );
- Value<?> value = iterator.next();
+ Value value = iterator.next();
assertEquals( nullStringValue, value );
attr.clear();
@@ -1482,7 +1480,7 @@ public class SchemaAwareAttributeTest
Attribute attr1 = new DefaultAttribute( atCN );
attr1.add( "a", "b", "c" );
- Iterator<Value<?>> iter = attr1.iterator();
+ Iterator<Value> iter = attr1.iterator();
assertTrue( iter.hasNext() );
@@ -1490,9 +1488,9 @@ public class SchemaAwareAttributeTest
{ "a", "b", "c" };
int pos = 0;
- for ( Value<?> val : attr1 )
+ for ( Value val : attr1 )
{
- assertTrue( val instanceof StringValue );
+ assertTrue( val instanceof Value );
assertEquals( values[pos++], val.getString() );
}
}
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareEntryTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareEntryTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareEntryTest.java Wed Mar 23 23:28:28 2016
@@ -39,11 +39,9 @@ import java.util.List;
import java.util.Set;
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.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
-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.name.Dn;
@@ -327,14 +325,14 @@ public class SchemaAwareEntryTest
/**
- * Test method for add( String, Value<?>... )
+ * Test method for add( String, Value... )
*/
@Test
public void testAddStringValueArray() throws LdapException
{
Entry entry = new DefaultEntry();
- Value<String> value = new StringValue( ( String ) null );
+ Value value = new Value( ( String ) null );
entry.add( "cn", value );
assertEquals( 1, entry.size() );
@@ -343,9 +341,9 @@ public class SchemaAwareEntryTest
assertNotNull( attributeCN.get() );
assertNull( attributeCN.get().getValue() );
- Value<String> value1 = new StringValue( "test1" );
- Value<String> value2 = new StringValue( "test2" );
- Value<String> value3 = new StringValue( "test1" );
+ Value value1 = new Value( "test1" );
+ Value value2 = new Value( "test2" );
+ Value value3 = new Value( "test1" );
entry.add( "sn", value1, value2, value3 );
assertEquals( 2, entry.size() );
@@ -355,7 +353,7 @@ public class SchemaAwareEntryTest
assertTrue( attributeSN.contains( value1 ) );
assertTrue( attributeSN.contains( value2 ) );
- Value<byte[]> value4 = new BinaryValue( BYTES1 );
+ Value value4 = new Value( BYTES1 );
entry.add( "l", value1, value4 );
assertEquals( 3, entry.size() );
Attribute attributeL = entry.get( "l" );
@@ -506,7 +504,7 @@ public class SchemaAwareEntryTest
/**
- * Test method for contains( Sring, Value<?>... )
+ * Test method for contains( Sring, Value... )
*/
@Test
public void testContainsStringValueArray() throws LdapException
@@ -520,15 +518,15 @@ public class SchemaAwareEntryTest
entry.add( attrCN, attrPWD );
- Value<String> strValue1 = new StringValue( "test1" );
- Value<String> strValue2 = new StringValue( "test2" );
- Value<String> strValue3 = new StringValue( "test3" );
- Value<String> strNullValue = new StringValue( ( String ) null );
-
- Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
- Value<byte[]> binValue2 = new BinaryValue( BYTES2 );
- Value<byte[]> binValue3 = new BinaryValue( BYTES3 );
- Value<byte[]> binNullValue = new BinaryValue( ( byte[] ) null );
+ Value strValue1 = new Value( "test1" );
+ Value strValue2 = new Value( "test2" );
+ Value strValue3 = new Value( "test3" );
+ Value strNullValue = new Value( ( String ) null );
+
+ Value binValue1 = new Value( BYTES1 );
+ Value binValue2 = new Value( BYTES2 );
+ Value binValue3 = new Value( BYTES3 );
+ Value binNullValue = new Value( ( byte[] ) null );
assertTrue( entry.contains( "CN", strValue1, strValue2, strNullValue ) );
assertTrue( entry.contains( "userpassword", binValue1, binValue2, binNullValue ) );
@@ -872,22 +870,22 @@ public class SchemaAwareEntryTest
/**
- * Test method for pu( String, Value<?>... )
+ * Test method for pu( String, Value... )
*/
@Test
public void testPutStringValueArray()
{
Entry entry = new DefaultEntry( exampleDn );
- Value<String> strValueTop = new StringValue( "top" );
- Value<String> strValuePerson = new StringValue( "person" );
- Value<String> strValueTop2 = new StringValue( "top" );
- Value<String> strNullValue = new StringValue( ( String ) null );
-
- Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
- Value<byte[]> binValue2 = new BinaryValue( BYTES2 );
- Value<byte[]> binValue3 = new BinaryValue( BYTES1 );
- Value<byte[]> binNullValue = new BinaryValue( ( byte[] ) null );
+ Value strValueTop = new Value( "top" );
+ Value strValuePerson = new Value( "person" );
+ Value strValueTop2 = new Value( "top" );
+ Value strNullValue = new Value( ( String ) null );
+
+ Value binValue1 = new Value( BYTES1 );
+ Value binValue2 = new Value( BYTES2 );
+ Value binValue3 = new Value( BYTES1 );
+ Value binNullValue = new Value( ( byte[] ) null );
try
{
@@ -1061,7 +1059,7 @@ public class SchemaAwareEntryTest
/**
- * Test method for remove(String, Value<?>... )
+ * Test method for remove(String, Value... )
*/
@Test
public void testRemoveStringValueArray() throws LdapException
@@ -1073,15 +1071,15 @@ public class SchemaAwareEntryTest
entry.add( attrCN, attrPWD );
- Value<String> strValue1 = new StringValue( "test1" );
- Value<String> strValue2 = new StringValue( "test2" );
- Value<String> strValue3 = new StringValue( "test3" );
- Value<String> strNullValue = new StringValue( ( String ) null );
-
- Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
- Value<byte[]> binValue2 = new BinaryValue( BYTES2 );
- Value<byte[]> binValue3 = new BinaryValue( BYTES3 );
- Value<byte[]> binNullValue = new BinaryValue( ( byte[] ) null );
+ Value strValue1 = new Value( "test1" );
+ Value strValue2 = new Value( "test2" );
+ Value strValue3 = new Value( "test3" );
+ Value strNullValue = new Value( ( String ) null );
+
+ Value binValue1 = new Value( BYTES1 );
+ Value binValue2 = new Value( BYTES2 );
+ Value binValue3 = new Value( BYTES3 );
+ Value binNullValue = new Value( ( byte[] ) null );
assertTrue( entry.remove( "cn", strValue1, strNullValue ) );
assertTrue( entry.contains( "cn", strValue2 ) );
@@ -1144,13 +1142,13 @@ public class SchemaAwareEntryTest
assertEquals( "Entry\n dn: dc=example,dc=com\n\n", entry.toString() );
- Value<String> strValueTop = new StringValue( "top" );
- Value<String> strValuePerson = new StringValue( "person" );
- Value<String> strNullValue = new StringValue( ( String ) null );
-
- Value<byte[]> binValue1 = new BinaryValue( BYTES1 );
- Value<byte[]> binValue2 = new BinaryValue( BYTES2 );
- Value<byte[]> binNullValue = new BinaryValue( ( byte[] ) null );
+ Value strValueTop = new Value( "top" );
+ Value strValuePerson = new Value( "person" );
+ Value strNullValue = new Value( ( String ) null );
+
+ Value binValue1 = new Value( BYTES1 );
+ Value binValue2 = new Value( BYTES2 );
+ Value binNullValue = new Value( ( byte[] ) null );
entry.put( "ObjectClass", strValueTop, strValuePerson, strNullValue );
entry.put( "UserPassword", binValue1, binValue2, binNullValue );
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareValueSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareValueSerializationTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareValueSerializationTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/SchemaAwareValueSerializationTest.java Wed Mar 23 23:28:28 2016
@@ -28,9 +28,9 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-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.exception.LdapInvalidAttributeValueException;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
@@ -54,18 +54,18 @@ public class SchemaAwareValueSerializati
{
private static final byte[] DATA = new byte[]
{ 0x01, 0x02, 0x03, 0x04 };
- private static BinaryValue bv1;
- private static BinaryValue bv2;
- private static BinaryValue bv3;
- private static BinaryValue bv1n;
- private static BinaryValue bv2n;
- private static BinaryValue bv3n;
- private static StringValue sv1;
- private static StringValue sv2;
- private static StringValue sv3;
- private static StringValue sv1n;
- private static StringValue sv2n;
- private static StringValue sv3n;
+ private static Value bv1;
+ private static Value bv2;
+ private static Value bv3;
+ private static Value bv1n;
+ private static Value bv2n;
+ private static Value bv3n;
+ private static Value sv1;
+ private static Value sv2;
+ private static Value sv3;
+ private static Value sv1n;
+ private static Value sv2n;
+ private static Value sv3n;
private static SchemaManager schemaManager;
private static AttributeType cn = null;
@@ -84,23 +84,23 @@ public class SchemaAwareValueSerializati
dc = schemaManager.getAttributeType( "dc" );
userCertificate = schemaManager.getAttributeType( "userCertificate" );
- bv1 = new BinaryValue( userCertificate, DATA );
- bv2 = new BinaryValue( userCertificate, StringConstants.EMPTY_BYTES );
- bv3 = new BinaryValue( userCertificate, null );
- bv1n = new BinaryValue( userCertificate, DATA );
- bv2n = new BinaryValue( userCertificate, StringConstants.EMPTY_BYTES );
- bv3n = new BinaryValue( userCertificate, null );
- sv1 = new StringValue( cn, "test" );
- sv2 = new StringValue( dc, "" );
- sv3 = new StringValue( dc, ( String ) null );
- sv1n = new StringValue( cn, "test" );
- sv2n = new StringValue( dc, "" );
- sv3n = new StringValue( dc, ( String ) null );
+ bv1 = new Value( userCertificate, DATA );
+ bv2 = new Value( userCertificate, StringConstants.EMPTY_BYTES );
+ bv3 = new Value( userCertificate, ( byte[] ) null );
+ bv1n = new Value( userCertificate, DATA );
+ bv2n = new Value( userCertificate, StringConstants.EMPTY_BYTES );
+ bv3n = new Value( userCertificate, ( byte[] ) null );
+ sv1 = new Value( cn, "test" );
+ sv2 = new Value( dc, "" );
+ sv3 = new Value( dc, ( String ) null );
+ sv1n = new Value( cn, "test" );
+ sv2n = new Value( dc, "" );
+ sv3n = new Value( dc, ( String ) null );
}
@Test
- public void testBinaryValueWithDataSerialization() throws IOException, ClassNotFoundException
+ public void testBinaryValueWithDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -112,14 +112,14 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( in );
+ Value bvDeser = Value.deserialize( in );
assertEquals( bv1, bvDeser );
}
@Test
- public void testBinaryValueWithEmptyDataSerialization() throws IOException, ClassNotFoundException
+ public void testBinaryValueWithEmptyDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -131,14 +131,14 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( in );
+ Value bvDeser = Value.deserialize( in );
assertEquals( bv2, bvDeser );
}
@Test
- public void testBinaryValueNoDataSerialization() throws IOException, ClassNotFoundException
+ public void testBinaryValueNoDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -150,14 +150,14 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( in );
+ Value bvDeser = Value.deserialize( in );
assertEquals( bv3, bvDeser );
}
@Test
- public void testStringValueWithDataSerialization() throws IOException, ClassNotFoundException
+ public void testStringValueWithDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -169,14 +169,14 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( in );
+ Value svDeser = Value.deserialize( in );
assertEquals( sv1, svDeser );
}
@Test
- public void testStringValueWithEmptyDataSerialization() throws IOException, ClassNotFoundException
+ public void testStringValueWithEmptyDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -188,14 +188,14 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( in );
+ Value svDeser = Value.deserialize( in );
assertEquals( sv2, svDeser );
}
@Test
- public void testStringValueNoDataSerialization() throws IOException, ClassNotFoundException
+ public void testStringValueNoDataSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -207,7 +207,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( in );
+ Value svDeser = Value.deserialize( in );
assertEquals( sv3, svDeser );
}
@@ -219,7 +219,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- BinaryValue value = new BinaryValue( userCertificate, bv1n.getBytes() );
+ Value value = new Value( userCertificate, bv1n.getBytes() );
value.writeExternal( out );
@@ -228,7 +228,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( userCertificate, in );
+ Value bvDeser = Value.deserialize( userCertificate, in );
assertEquals( value, bvDeser );
}
@@ -240,7 +240,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- BinaryValue value = new BinaryValue( userCertificate, bv2n.getBytes() );
+ Value value = new Value( userCertificate, bv2n.getBytes() );
value.writeExternal( out );
@@ -249,7 +249,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( userCertificate, in );
+ Value bvDeser = Value.deserialize( userCertificate, in );
assertEquals( value, bvDeser );
}
@@ -261,7 +261,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- BinaryValue value = new BinaryValue( userCertificate, bv3n.getBytes() );
+ Value value = new Value( userCertificate, bv3n.getBytes() );
value.writeExternal( out );
@@ -270,7 +270,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- BinaryValue bvDeser = BinaryValue.deserialize( userCertificate, in );
+ Value bvDeser = Value.deserialize( userCertificate, in );
assertEquals( value, bvDeser );
}
@@ -282,7 +282,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- StringValue value = new StringValue( cn, sv1n.getString() );
+ Value value = new Value( cn, sv1n.getString() );
value.writeExternal( out );
@@ -291,7 +291,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( cn, in );
+ Value svDeser = Value.deserialize( cn, in );
assertEquals( value, svDeser );
}
@@ -303,7 +303,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- StringValue value = new StringValue( dc, sv2n.getString() );
+ Value value = new Value( dc, sv2n.getString() );
value.writeExternal( out );
@@ -312,7 +312,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( dc, in );
+ Value svDeser = Value.deserialize( dc, in );
assertEquals( value, svDeser );
}
@@ -324,7 +324,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- StringValue value = new StringValue( dc, sv3n.getString() );
+ Value value = new Value( dc, sv3n.getString() );
value.writeExternal( out );
@@ -333,7 +333,7 @@ public class SchemaAwareValueSerializati
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- StringValue svDeser = StringValue.deserialize( dc, in );
+ Value svDeser = Value.deserialize( dc, in );
assertEquals( value, svDeser );
}
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/entry/TestEntryUtils.java Wed Mar 23 23:28:28 2016
@@ -20,8 +20,6 @@
package org.apache.directory.api.ldap.entry;
-import org.apache.directory.api.ldap.model.entry.BinaryValue;
-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.AttributeType;
@@ -159,11 +157,11 @@ public final class TestEntryUtils
public static final long serialVersionUID = 1L;
- public Value<?> normalize( Value<?> value ) throws LdapException
+ public Value normalize( Value value ) throws LdapException
{
if ( value.isHumanReadable() )
{
- return new StringValue( Strings.toLowerCaseAscii( value.getString() ) );
+ return new Value( Strings.toLowerCaseAscii( value.getString() ) );
}
throw new IllegalStateException();
@@ -255,7 +253,7 @@ public final class TestEntryUtils
public static final long serialVersionUID = 1L;
- public Value<?> normalize( Value<?> value ) throws LdapException
+ public Value normalize( Value value ) throws LdapException
{
if ( !value.isHumanReadable() )
{
@@ -271,7 +269,7 @@ public final class TestEntryUtils
newVal[i++] = ( byte ) ( b & 0x007F );
}
- return new BinaryValue( Strings.trim( newVal ) );
+ return new Value( Strings.trim( newVal ) );
}
throw new IllegalStateException();
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java Wed Mar 23 23:28:28 2016
@@ -2520,7 +2520,7 @@ public class DnTest
assertEquals( " cn = #414243 ", dn3.getRdn().getName() );
Ava atav3 = dn3.getRdn().getAva();
assertEquals( "cn", atav3.getType() );
- assertTrue( Arrays.equals( Strings.getBytesUtf8( "ABC" ), (byte[])atav3.getValue().getValue() ) );
+ assertTrue( Arrays.equals( Strings.getBytesUtf8( "ABC" ), atav3.getValue().getBytes() ) );
assertTrue( Arrays.equals( Strings.getBytesUtf8( "ABC" ), atav3.getValue().getBytes() ) );
// antlr parser:
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java Wed Mar 23 23:28:28 2016
@@ -336,7 +336,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : attributeTypes )
+ for ( Value value : attributeTypes )
{
String desc = value.getString();
@@ -364,7 +364,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : comparators )
+ for ( Value value : comparators )
{
String desc = value.getString();
@@ -392,7 +392,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : ditContentRules )
+ for ( Value value : ditContentRules )
{
String desc = value.getString();
@@ -420,7 +420,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : ditStructureRules )
+ for ( Value value : ditStructureRules )
{
String desc = value.getString();
@@ -448,7 +448,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : ldapSyntaxes )
+ for ( Value value : ldapSyntaxes )
{
String desc = value.getString();
@@ -476,7 +476,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : matchingRules )
+ for ( Value value : matchingRules )
{
String desc = value.getString();
@@ -504,7 +504,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : matchingRuleUses )
+ for ( Value value : matchingRuleUses )
{
String desc = value.getString();
@@ -532,7 +532,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : nameForms )
+ for ( Value value : nameForms )
{
String desc = value.getString();
@@ -560,7 +560,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : normalizers )
+ for ( Value value : normalizers )
{
String desc = value.getString();
@@ -588,7 +588,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : objectClasses )
+ for ( Value value : objectClasses )
{
String desc = value.getString();
@@ -616,7 +616,7 @@ public class DefaultSchemaLoader extends
return;
}
- for ( Value<?> value : syntaxCheckers )
+ for ( Value value : syntaxCheckers )
{
String desc = value.getString();
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Wed Mar 23 23:28:28 2016
@@ -537,11 +537,11 @@ public interface LdapConnection extends
*
* @param dn the target entry's distinguished name, it must be a valid {@link Dn}
* @param attributeName the attribute's name
- * @param value a Value<?> value with which the target entry's attribute value to be compared with
+ * @param value a Value value with which the target entry's attribute value to be compared with
* @return <code>true</code> if the value matches, <code>false</code> otherwise
* @throws LdapException if some error occurred
*/
- boolean compare( String dn, String attributeName, Value<?> value ) throws LdapException;
+ boolean compare( String dn, String attributeName, Value value ) throws LdapException;
/**
@@ -576,11 +576,11 @@ public interface LdapConnection extends
*
* @param dn the target entry's distinguished name
* @param attributeName the attribute's name
- * @param value a Value<?> value with which the target entry's attribute value to be compared with
+ * @param value a Value value with which the target entry's attribute value to be compared with
* @return <code>true</code> if the value matches, <code>false</code> otherwise
* @throws LdapException if some error occurred
*/
- boolean compare( Dn dn, String attributeName, Value<?> value ) throws LdapException;
+ boolean compare( Dn dn, String attributeName, Value value ) throws LdapException;
/**
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionWrapper.java Wed Mar 23 23:28:28 2016
@@ -366,7 +366,7 @@ public class LdapConnectionWrapper imple
@Override
- public boolean compare( String dn, String attributeName, Value<?> value ) throws LdapException
+ public boolean compare( String dn, String attributeName, Value value ) throws LdapException
{
return connection.compare( dn, attributeName, value );
}
@@ -387,7 +387,7 @@ public class LdapConnectionWrapper imple
@Override
- public boolean compare( Dn dn, String attributeName, Value<?> value ) throws LdapException
+ public boolean compare( Dn dn, String attributeName, Value value ) throws LdapException
{
return connection.compare( dn, attributeName, value );
}
Modified: directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1736388&r1=1736387&r2=1736388&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/shared-value/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Wed Mar 23 23:28:28 2016
@@ -2988,7 +2988,7 @@ public class LdapNetworkConnection exten
/**
* {@inheritDoc}
*/
- public boolean compare( String dn, String attributeName, Value<?> value ) throws LdapException
+ public boolean compare( String dn, String attributeName, Value value ) throws LdapException
{
return compare( new Dn( dn ), attributeName, value );
}
@@ -3029,7 +3029,7 @@ public class LdapNetworkConnection exten
/**
* {@inheritDoc}
*/
- public boolean compare( Dn dn, String attributeName, Value<?> value ) throws LdapException
+ public boolean compare( Dn dn, String attributeName, Value value ) throws LdapException
{
CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( dn );
@@ -3500,7 +3500,7 @@ public class LdapNetworkConnection exten
}
}
- for ( Value<?> value : attr )
+ for ( Value value : attr )
{
supportedControls.add( value.getString() );
}