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/05/09 17:22:21 UTC
svn commit: r1743011 [1/13] - in /directory/shared/branches/shared-value:
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/
dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/
dsml/parser/src/test/java/org/apache/direct...
Author: elecharny
Date: Mon May 9 17:22:19 2016
New Revision: 1743011
URL: http://svn.apache.org/viewvc?rev=1743011&view=rev
Log:
Fixed the Dn:Rdn/Ava/Value classes to make them immutable and to handle properly the String Preparation process.
Added:
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/node/
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleTypeEnum.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PreparedNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerComparator.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizerTest.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ExpansibleByteBuffer.java
- copied, changed from r1736388, directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ByteBuffer.java
Removed:
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDnNormalizer.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/DefaultStringNormalizer.java
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.1.ldif
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/ByteBuffer.java
Modified:
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/CompareRequestDsml.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/addResponse/AddResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/authResponse/AuthResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareRequest/CompareRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareResponse/CompareResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delRequest/DelRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delResponse/DelResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/extendedResponse/ExtendedResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNRequest/ModifyDNRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNResponse/ModifyDNResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyRequest/ModifyRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyResponse/ModifyResponseTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java
directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.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/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
directory/shared/branches/shared-value/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
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/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/AvaTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/DnTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/MultiThreadedTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareDnSerializationTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnSerializationTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareRdnTest.java
directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/subtree/SubtreeSpecificationParserTest.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/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/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/InitExtensibleMatchFilter.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/searchRequest/filter/InitOrFilter.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/ModifyDnRequestDecorator.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/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/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/branches/shared-value/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/search/SearchRequestTest.java
directory/shared/branches/shared-value/ldap/extras/aci/src/main/antlr/ACIItem.g
directory/shared/branches/shared-value/ldap/model/src/checkstyle/suppressions.xml
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/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/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/AssertionNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNormalizedVisitor.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/ExprNode.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/LeafNode.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/ObjectClassNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/ScopeNode.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/filter/UndefinedNode.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifRevertor.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/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/message/BindRequestImpl.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.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/ComplexDnParser.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/AttributeType.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/PrepareString.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DnComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/GeneralizedTimeComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NormalizingComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.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/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/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/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/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.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/BranchNormalizedVisitorTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterCloneTest.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/filter/FilterToStringTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/SubstringNodeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/UndefinedNodeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/AvaSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnParserTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/DnSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/FastDnParserTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/PrepareStringTest.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/DeepTrimNormalizerTest.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/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizerTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizerTest.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/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.3.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=comparators/m-oid=1.3.6.1.4.1.18060.0.4.0.1.4.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=comparators/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=nis/ou=normalizers/m-oid=1.3.6.1.4.1.4203.1.2.1.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.11.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.12.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.2.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.24.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.3.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.4.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.5.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=comparators/m-oid=2.5.13.7.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.1.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.2.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=1.3.6.1.4.1.1466.109.114.3.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.11.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.12.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.2.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.24.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.3.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.4.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.5.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=normalizers/m-oid=2.5.13.7.ldif
directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerEnableDisableLoadTest.java
directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadTest.java
directory/shared/branches/shared-value/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schema/loader/SchemaManagerLoadWithDepsTest.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Strings.java
directory/shared/branches/shared-value/util/src/main/java/org/apache/directory/api/util/Unicode.java
directory/shared/branches/shared-value/util/src/test/java/org/apache/directory/api/util/ByteBufferTest.java
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -182,7 +182,7 @@ public class AddRequestDsml
}
else
{
- attributeElement.addElement( "value" ).addText( value.getString() );
+ attributeElement.addElement( "value" ).addText( value.getValue() );
}
}
}
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -93,7 +93,7 @@ public class CompareRequestDsml
}
if ( request.getAssertionValue() != null )
{
- assertionElement.addElement( "value" ).setText( request.getAssertionValue().getString() );
+ assertionElement.addElement( "value" ).setText( request.getAssertionValue().getValue() );
}
return element;
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -180,7 +180,7 @@ public class ModifyRequestDsml
}
else
{
- modElement.addElement( "value" ).setText( value.getString() );
+ modElement.addElement( "value" ).setText( value.getValue() );
}
}
}
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -249,22 +249,29 @@ public class SearchRequestDsml
// Transform =, >=, <=, ~= filters
int filterType = avaFilter.getFilterType();
+ byte[] value = null;
+
+ if ( ava.getAssertionValue() != null )
+ {
+ value = ava.getAssertionValue().getBytes();
+ }
+
switch ( filterType )
{
case LdapCodecConstants.EQUALITY_MATCH_FILTER:
- branch = new EqualityNode( ava.getAttributeDesc(), ava.getAssertionValue() );
+ branch = new EqualityNode( ava.getAttributeDesc(), value );
break;
case LdapCodecConstants.GREATER_OR_EQUAL_FILTER:
- branch = new GreaterEqNode( ava.getAttributeDesc(), ava.getAssertionValue() );
+ branch = new GreaterEqNode( ava.getAttributeDesc(), value );
break;
case LdapCodecConstants.LESS_OR_EQUAL_FILTER:
- branch = new LessEqNode( ava.getAttributeDesc(), ava.getAssertionValue() );
+ branch = new LessEqNode( ava.getAttributeDesc(), value );
break;
case LdapCodecConstants.APPROX_MATCH_FILTER:
- branch = new ApproximateNode( ava.getAttributeDesc(), ava.getAssertionValue() );
+ branch = new ApproximateNode( ava.getAttributeDesc(), value );
break;
default:
@@ -554,7 +561,7 @@ public class SearchRequestDsml
}
else
{
- newElement.addElement( VALUE ).setText( value.getString() );
+ newElement.addElement( VALUE ).setText( value.getValue() );
}
}
}
@@ -588,7 +595,7 @@ public class SearchRequestDsml
}
else
{
- newElement.addElement( VALUE ).setText( value.getString() );
+ newElement.addElement( VALUE ).setText( value.getValue() );
}
}
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -169,7 +169,7 @@ public class SearchResultEntryDsml
}
else
{
- attributeElement.addElement( "value" ).addText( value.getString() );
+ attributeElement.addElement( "value" ).addText( 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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -88,7 +88,7 @@ public class AddRequestTest extends Abst
AddRequest addRequest = ( AddRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", addRequest.getEntryDn().getNormName() );
+ assertTrue( addRequest.getEntryDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
@@ -411,7 +411,7 @@ public class AddRequestTest extends Abst
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "top", value.getString() );
+ assertEquals( "top", value.getValue() );
}
@@ -451,7 +451,7 @@ public class AddRequestTest extends Abst
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
assertFalse( value.isHumanReadable() );
- assertEquals( "DSMLv2.0 rocks!!", value.getString() );
+ assertEquals( "DSMLv2.0 rocks!!", value.getValue() );
}
@@ -490,10 +490,10 @@ public class AddRequestTest extends Abst
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "top", value.getString() );
+ assertEquals( "top", value.getValue() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
- assertEquals( "person", value.getString() );
+ assertEquals( "person", value.getValue() );
assertFalse( valueIterator.hasNext() );
}
@@ -543,10 +543,10 @@ public class AddRequestTest extends Abst
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "top", value.getString() );
+ assertEquals( "top", value.getValue() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
- assertEquals( "person", value.getString() );
+ assertEquals( "person", value.getValue() );
assertFalse( valueIterator.hasNext() );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addResponse/AddResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/addResponse/AddResponseTest.java Mon May 9 17:22:19 2016
@@ -504,7 +504,7 @@ public class AddResponseTest extends Abs
LdapResult ldapResult = addResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/authResponse/AuthResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/authResponse/AuthResponseTest.java Mon May 9 17:22:19 2016
@@ -527,7 +527,7 @@ public class AuthResponseTest extends Ab
LdapResult ldapResult = bindResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareRequest/CompareRequestTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareRequest/CompareRequestTest.java Mon May 9 17:22:19 2016
@@ -85,7 +85,7 @@ public class CompareRequestTest extends
CompareRequest compareRequest = ( CompareRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", compareRequest.getName().getNormName() );
+ assertTrue( compareRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
@@ -324,7 +324,7 @@ public class CompareRequestTest extends
CompareRequest compareRequest = ( CompareRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", compareRequest.getName().getNormName() );
+ assertTrue( compareRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
assertEquals( "sn", compareRequest.getAttributeId() );
@@ -355,11 +355,11 @@ public class CompareRequestTest extends
CompareRequest compareRequest = ( CompareRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", compareRequest.getName().getNormName() );
+ assertTrue( compareRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
assertEquals( "sn", compareRequest.getAttributeId() );
- assertEquals( "DSMLv2.0 rocks!!", compareRequest.getAssertionValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", compareRequest.getAssertionValue().getValue() );
}
@@ -386,7 +386,7 @@ public class CompareRequestTest extends
CompareRequest compareRequest = ( CompareRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", compareRequest.getName().getNormName() );
+ assertTrue( compareRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
assertEquals( "sn", compareRequest.getAttributeId() );
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareResponse/CompareResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/compareResponse/CompareResponseTest.java Mon May 9 17:22:19 2016
@@ -528,7 +528,7 @@ public class CompareResponseTest extends
LdapResult ldapResult = compareResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delRequest/DelRequestTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delRequest/DelRequestTest.java Mon May 9 17:22:19 2016
@@ -83,7 +83,7 @@ public class DelRequestTest extends Abst
DeleteRequest delRequest = ( DeleteRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", delRequest.getName().getNormName() );
+ assertTrue( delRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delResponse/DelResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/delResponse/DelResponseTest.java Mon May 9 17:22:19 2016
@@ -525,7 +525,7 @@ public class DelResponseTest extends Abs
LdapResult ldapResult = delResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/extendedResponse/ExtendedResponseTest.java Mon May 9 17:22:19 2016
@@ -531,7 +531,7 @@ public class ExtendedResponseTest extend
LdapResult ldapResult = extendedResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNRequest/ModifyDNRequestTest.java Mon May 9 17:22:19 2016
@@ -306,7 +306,7 @@ public class ModifyDNRequestTest extends
ModifyDnRequest modifyDNRequest = ( ModifyDnRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", modifyDNRequest.getName().getNormName() );
+ assertTrue( modifyDNRequest.getName().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
assertEquals( "CN=Steve Jobs", modifyDNRequest.getNewRdn().getName() );
}
@@ -453,7 +453,7 @@ public class ModifyDNRequestTest extends
ModifyDnRequest modifyDNRequest = ( ModifyDnRequest ) parser.getBatchRequest().getCurrentRequest();
- assertEquals( "cn=Steve Jobs,ou=Dev,dc=apple,dc=com", modifyDNRequest.getNewSuperior().getNormName() );
+ assertTrue( modifyDNRequest.getNewSuperior().equals( "cn=Steve Jobs,ou=Dev,dc=apple,dc=com" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modDNResponse/ModifyDNResponseTest.java Mon May 9 17:22:19 2016
@@ -528,7 +528,7 @@ public class ModifyDNResponseTest extend
LdapResult ldapResult = modifyDNResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyRequest/ModifyRequestTest.java Mon May 9 17:22:19 2016
@@ -312,7 +312,7 @@ public class ModifyRequestTest extends A
Attribute attribute = modification.getAttribute();
assertEquals( "directreport", attribute.getId() );
- assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getString() );
+ assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getValue() );
}
@@ -355,7 +355,7 @@ public class ModifyRequestTest extends A
'a', 'r', 'n', 'y', ',', ' ', 'o', 'u', '=', 'p', 'e', 'o', 'p', 'l', 'e', ',', ' ', 'd', 'c', '=',
'e', 'x', 'a', 'm', 'p', 'l', 'e', ',', ' ', 'd', 'c', '=', 'c', 'o', 'm' }, StandardCharsets.UTF_8 );
- assertEquals( expected, attribute.get().getString() );
+ assertEquals( expected, attribute.get().getValue() );
}
@@ -394,7 +394,7 @@ public class ModifyRequestTest extends A
Attribute attribute = modification.getAttribute();
assertEquals( "directreport", attribute.getId() );
- assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getString() );
+ assertEquals( "CN=John Smith, DC=microsoft, DC=com", attribute.get().getValue() );
modification = iter.next();
@@ -403,7 +403,7 @@ public class ModifyRequestTest extends A
assertEquals( "sn", attribute.getId() );
assertEquals( ModificationOperation.REPLACE_ATTRIBUTE, modification.getOperation() );
- assertEquals( "CN=Steve Jobs, DC=apple, DC=com", attribute.get().getString() );
+ assertEquals( "CN=Steve Jobs, DC=apple, DC=com", attribute.get().getValue() );
}
@@ -649,7 +649,7 @@ public class ModifyRequestTest extends A
assertEquals( "directreport", attribute.getId() );
assertEquals( 1, attribute.size() );
- assertEquals( "", attribute.get().getString() );
+ assertEquals( "", attribute.get().getValue() );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/modifyResponse/ModifyResponseTest.java Mon May 9 17:22:19 2016
@@ -528,7 +528,7 @@ public class ModifyResponseTest extends
LdapResult ldapResult = modifyResponse.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchRequest/SearchRequestTest.java Mon May 9 17:22:19 2016
@@ -1019,7 +1019,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", approxMatchFilter.getAttribute() );
- assertEquals( "foobar", approxMatchFilter.getValue().getString() );
+ assertEquals( "foobar", approxMatchFilter.getValue().getValue() );
}
@@ -1054,7 +1054,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", approxMatchFilter.getAttribute() );
- assertEquals( "DSMLv2.0 rocks!!", approxMatchFilter.getValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", approxMatchFilter.getValue().getValue() );
}
@@ -1089,7 +1089,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", approxMatchFilter.getAttribute() );
- assertNull( approxMatchFilter.getValue() );
+ assertEquals( "", approxMatchFilter.getValue().getValue() );
}
@@ -1154,7 +1154,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", greaterEqFilter.getAttribute() );
- assertEquals( "foobar", greaterEqFilter.getValue().getString() );
+ assertEquals( "foobar", greaterEqFilter.getValue().getValue() );
}
@@ -1189,7 +1189,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", greaterEqFilter.getAttribute() );
- assertEquals( "DSMLv2.0 rocks!!", greaterEqFilter.getValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", greaterEqFilter.getValue().getValue() );
}
@@ -1224,7 +1224,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", greaterEqFilter.getAttribute() );
- assertNull( greaterEqFilter.getValue() );
+ assertEquals( "", greaterEqFilter.getValue().getValue() );
}
@@ -1289,7 +1289,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", lessOrEqFilter.getAttribute() );
- assertEquals( "foobar", lessOrEqFilter.getValue().getString() );
+ assertEquals( "foobar", lessOrEqFilter.getValue().getValue() );
}
@@ -1324,7 +1324,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", lessOrEqFilter.getAttribute() );
- assertEquals( "DSMLv2.0 rocks!!", lessOrEqFilter.getValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", lessOrEqFilter.getValue().getValue() );
}
@@ -1359,7 +1359,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", lessOrEqFilter.getAttribute() );
- assertNull( lessOrEqFilter.getValue() );
+ assertEquals( "", lessOrEqFilter.getValue().getValue() );
}
@@ -1423,7 +1423,7 @@ public class SearchRequestTest extends A
EqualityNode<?> equalityFilter = ( EqualityNode<?> ) filter;
assertEquals( "sn", equalityFilter.getAttribute() );
- assertEquals( "foobar", equalityFilter.getValue().getString() );
+ assertEquals( "foobar", equalityFilter.getValue().getValue() );
}
@@ -1458,7 +1458,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", equalityFilter.getAttribute() );
- assertEquals( "DSMLv2.0 rocks!!", equalityFilter.getValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", equalityFilter.getValue().getValue() );
}
@@ -1493,7 +1493,7 @@ public class SearchRequestTest extends A
assertEquals( "sn", equalityFilter.getAttribute() );
- assertNull( equalityFilter.getValue() );
+ assertEquals( "", equalityFilter.getValue().getValue() );
}
@@ -1599,7 +1599,7 @@ public class SearchRequestTest extends A
ExtensibleNode extensibleMatchFilter = ( ExtensibleNode ) filter;
- assertEquals( "A Value", extensibleMatchFilter.getValue().getString() );
+ assertEquals( "A Value", extensibleMatchFilter.getValue().getValue() );
assertEquals( false, extensibleMatchFilter.hasDnAttributes() );
}
@@ -1634,7 +1634,7 @@ public class SearchRequestTest extends A
ExtensibleNode extensibleMatchFilter = ( ExtensibleNode ) filter;
- assertEquals( "DSMLv2.0 rocks!!", extensibleMatchFilter.getValue().getString() );
+ assertEquals( "DSMLv2.0 rocks!!", extensibleMatchFilter.getValue().getValue() );
assertEquals( false, extensibleMatchFilter.hasDnAttributes() );
}
Modified: directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/branches/shared-value/dsml/parser/src/test/java/org/apache/directory/api/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Mon May 9 17:22:19 2016
@@ -554,7 +554,7 @@ public class SearchResultDoneTest extend
LdapResult ldapResult = searchResultDone.getLdapResult();
- assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
+ assertTrue( ldapResult.getMatchedDn().equals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM" ) );
}
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -393,7 +393,7 @@ public class SearchResultEntryTest exten
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "example", value.getString() );
+ assertEquals( "example", value.getValue() );
}
@@ -437,7 +437,7 @@ public class SearchResultEntryTest exten
String expected = new String( new byte[]
{ 'E', 'm', 'm', 'a', 'n', 'u', 'e', 'l', ' ', 'L', ( byte ) 0xc3, ( byte ) 0xa9, 'c', 'h', 'a', 'r', 'n',
'y' }, StandardCharsets.UTF_8 );
- assertEquals( expected, value.getString() );
+ assertEquals( expected, value.getValue() );
}
@@ -477,7 +477,7 @@ public class SearchResultEntryTest exten
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "", value.getString() );
+ assertEquals( "", value.getValue() );
}
@@ -517,10 +517,10 @@ public class SearchResultEntryTest exten
Iterator<Value> valueIterator = attribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "top", value.getString() );
+ assertEquals( "top", value.getValue() );
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
- assertEquals( "domain", value.getString() );
+ assertEquals( "domain", value.getValue() );
assertFalse( valueIterator.hasNext() );
}
@@ -559,7 +559,7 @@ public class SearchResultEntryTest exten
Iterator<Value> valueIterator = objectClassAttribute.iterator();
assertTrue( valueIterator.hasNext() );
Value value = valueIterator.next();
- assertEquals( "top", value.getString() );
+ assertEquals( "top", value.getValue() );
assertFalse( valueIterator.hasNext() );
Attribute dcAttribute = entry.get( "dc" );
@@ -568,7 +568,7 @@ public class SearchResultEntryTest exten
valueIterator = dcAttribute.iterator();
assertTrue( valueIterator.hasNext() );
value = valueIterator.next();
- assertEquals( "example", value.getString() );
+ assertEquals( "example", value.getValue() );
assertFalse( valueIterator.hasNext() );
}
Modified: directory/shared/branches/shared-value/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java (original)
+++ directory/shared/branches/shared-value/i18n/src/main/java/org/apache/directory/api/i18n/I18n.java Mon May 9 17:22:19 2016
@@ -277,7 +277,7 @@ public enum I18n
ERR_04136("ERR_04136"),
ERR_04137("ERR_04137"),
ERR_04138("ERR_04138"),
- ERR_04139("ERR_04139"),
+ ERR_04139_NULL_SYNTAX_CHECKER("ERR_04139_NULL_SYNTAX_CHECKER"),
ERR_04140_UNACCEPTABLE_RESULT_CODE("ERR_04140_UNACCEPTABLE_RESULT_CODE"),
ERR_04141("ERR_04141"),
ERR_04142("ERR_04142"),
@@ -286,7 +286,7 @@ public enum I18n
ERR_04145("ERR_04145"),
ERR_04146("ERR_04146"),
ERR_04147("ERR_04147"),
- ERR_04148("ERR_04148"),
+ ERR_04148_MATCHING_RULE_EXPECTED("ERR_04148_MATCHING_RULE_EXPECTED"),
ERR_04149("ERR_04149"),
ERR_04150("ERR_04150"),
ERR_04151("ERR_04151"),
@@ -433,7 +433,7 @@ public enum I18n
ERR_04292("ERR_04292"),
ERR_04293("ERR_04293"),
ERR_04294("ERR_04294"),
- ERR_04295("ERR_04295"),
+ ERR_04295_NO_NORMALIZER("ERR_04295_NO_NORMALIZER"),
ERR_04296("ERR_04296"),
ERR_04297("ERR_04297"),
ERR_04298("ERR_04298"),
@@ -580,10 +580,10 @@ public enum I18n
ERR_04439("ERR_04439"),
ERR_04440("ERR_04440"),
ERR_04441("ERR_04441"),
- ERR_04442_NOT_EXISTING_ATRIBUTE_TYPE("ERR_04442_NOT_EXISTING_ATRIBUTE_TYPE"),
+ ERR_04442_NOT_EXISTING_ATTRIBUTE_TYPE("ERR_04442_NOT_EXISTING_ATTRIBUTE_TYPE"),
ERR_04443("ERR_04443"),
ERR_04444("ERR_04444"),
- ERR_04445("ERR_04445"),
+ ERR_04445_NO_SYNTAX("ERR_04445_NO_SYNTAX"),
ERR_04446("ERR_04446"),
ERR_04447_CANNOT_NORMALIZE_VALUE("ERR_04447_CANNOT_NORMALIZE_VALUE"),
ERR_04448("ERR_04448"),
@@ -626,6 +626,7 @@ public enum I18n
ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY("ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY"),
ERR_04486_VALUE_ALREADY_EXISTS("ERR_04486_VALUE_ALREADY_EXISTS"),
ERR_04487_ATTRIBUTE_IS_SINGLE_VALUED("ERR_04487_ATTRIBUTE_IS_SINGLE_VALUED"),
+ ERR_04488_NULL_ATTRIBUTE_TYPE("ERR_04488_NULL_ATTRIBUTE_TYPE"),
// ldap-constants
ERR_05001_UNKNOWN_AUTHENT_LEVEL("ERR_05001_UNKNOWN_AUTHENT_LEVEL"),
Modified: directory/shared/branches/shared-value/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties (original)
+++ directory/shared/branches/shared-value/i18n/src/main/resources/org/apache/directory/api/i18n/errors.properties Mon May 9 17:22:19 2016
@@ -264,7 +264,7 @@ ERR_04135=The AttributeType list should
ERR_04136=The AttributeType list should not contain null values
ERR_04137=The attribute ''{0}'' does not exist in the entry
ERR_04138=The removal of values for the missing ''{0}'' attribute is not possible
-ERR_04139=Cannot validate {0} with a null SyntaxChecker
+ERR_04139_NULL_SYNTAX_CHECKER=Cannot validate {0} with a null SyntaxChecker
ERR_04140_UNACCEPTABLE_RESULT_CODE=Unacceptable result code for this exception type: {0}
ERR_04141={0} is not an acceptable result code.
ERR_04142=Only UNWILLING_TO_PERFORM and UNAVAILABLE_CRITICAL_EXTENSION result codes are allowed to be used with this exception
@@ -273,7 +273,7 @@ ERR_04144=ScopeNode can''t be part of a
ERR_04145=AssertionNode can''t be part of a refinement
ERR_04146=AssertionValue expected
ERR_04147=Expected MatchingRule or assertionValue
-ERR_04148=MatchingRule expected
+ERR_04148_MATCHING_RULE_EXPECTED=MatchingRule expected
ERR_04149=Not a valid escaped value
ERR_04150=Bad substring
ERR_04151=Bad char
@@ -420,7 +420,7 @@ ERR_04291=There is already a SchemaObjec
ERR_04292=Cannot build the references for {0}, error : {1}
ERR_04293=Cannot remove the references for {0}, error : {1}
ERR_04294=The MatchingRule {0} does not have a syntax. This is invalid
-ERR_04295=The MatchingRule {0} does not have a normalizer. This is invalid
+ERR_04295_NO_NORMALIZER=The MatchingRule {0} does not have a normalizer. This is invalid
ERR_04296=The MatchingRule {0} does not have a comparator. This is invalid
ERR_04297=The AttributeType {0} can''t have itself as a superior, or a cycle has been detected while processing the superior''s tree
ERR_04298=The AttributeType {0} does not have a superior nor a Syntax. This is invalid
@@ -567,10 +567,10 @@ ERR_04438=The style must not be null
ERR_04439=Usage - java org.mortbay.util.UnixCrypt <key> <salt>
ERR_04440=Crypt={0}
ERR_04441=Cannot modify the SchemaObject {0}, it has been locked
-ERR_04442_NOT_EXISTING_ATRIBUTE_TYPE=The AttributeType {0} does not exist
+ERR_04442_NOT_EXISTING_ATTRIBUTE_TYPE=The AttributeType {0} does not exist
ERR_04443=Failed to compare normalized values for {0} and {1}
ERR_04444=I don''t really know how to compare anything other than ServerBinaryValues at this point in time.
-ERR_04445=There is no Syntax associated with this attributeType
+ERR_04445_NO_SYNTAX=There is no Syntax associated with this attributeType
ERR_04446=Cannot use standard serialization for a ServerStringValue
ERR_04447_CANNOT_NORMALIZE_VALUE=Cannot normalize the wrapped value {0}
ERR_04448=I don''t know what to do if value is not a ServerStringValue
@@ -613,6 +613,7 @@ ERR_04484_COLLECTIVE_NOT_ALLOWED_IN_MUST
ERR_04485_COLLECTIVE_NOT_ALLOWED_IN_MAY=The Collective Attribute ({0}) cannot be added in the MAY list of the {1} ObjectClass
ERR_04486_VALUE_ALREADY_EXISTS=The value ''{0}'' already exists in the attribute ({1})
ERR_04487_ATTRIBUTE_IS_SINGLE_VALUED=The attribute ''{0}'' is single valued, we can't add no more values into it
+ERR_04488_NULL_ATTRIBUTE_TYPE=The AttributeType cannot be null
# ldap-constants
ERR_05001_UNKNOWN_AUTHENT_LEVEL=Unknown AuthenticationLevel {0}
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -57,7 +57,7 @@ public class ApiLdapModelOsgiTest extend
new BindRequestImpl();
- new EqualityNode<String>( "cn", new Value( "foo" ) );
+ new EqualityNode<String>( "cn", "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/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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -237,7 +237,7 @@ public class SchemaAwareAttributeTest
Value value = attr.get();
assertTrue( value instanceof Value );
- assertEquals( "test", ( ( Value ) value ).getString() );
+ assertEquals( "test", ( ( Value ) value ).getValue() );
// Add a binary value
assertEquals( 0, attr.add( new byte[]
@@ -1051,13 +1051,13 @@ public class SchemaAwareAttributeTest
Attribute attr2 = new DefaultAttribute( "email", atEMail );
attr2.add( "a", "b", "c" );
- assertEquals( "a", attr2.get().getString() );
+ assertEquals( "a", attr2.get().getValue() );
attr2.remove( "a" );
- assertEquals( "b", attr2.get().getString() );
+ assertEquals( "b", attr2.get().getValue() );
attr2.remove( "b" );
- assertEquals( "c", attr2.get().getString() );
+ assertEquals( "c", attr2.get().getValue() );
attr2.remove( "c" );
assertNull( attr2.get() );
@@ -1103,9 +1103,9 @@ public class SchemaAwareAttributeTest
attr.add( "a", "b", "c" );
iterator = attr.iterator();
assertTrue( iterator.hasNext() );
- assertEquals( "a", iterator.next().getString() );
- assertEquals( "b", iterator.next().getString() );
- assertEquals( "c", iterator.next().getString() );
+ assertEquals( "a", iterator.next().getValue() );
+ assertEquals( "b", iterator.next().getValue() );
+ assertEquals( "c", iterator.next().getValue() );
assertFalse( iterator.hasNext() );
}
@@ -1491,7 +1491,7 @@ public class SchemaAwareAttributeTest
for ( Value val : attr1 )
{
assertTrue( val instanceof Value );
- assertEquals( values[pos++], val.getString() );
+ assertEquals( values[pos++], val.getValue() );
}
}
@@ -2104,7 +2104,7 @@ public class SchemaAwareAttributeTest
assertEquals( dsa.toString(), dsaSer.toString() );
assertEquals( "0.9.2342.19200300.100.1.25", dsaSer.getId() );
assertEquals( "DomainComponent", dsaSer.getUpId() );
- assertEquals( "", dsaSer.getString() );
+ assertNull( dsaSer.getString() );
assertEquals( 1, dsaSer.size() );
assertTrue( dsaSer.contains( ( String ) null ) );
assertTrue( dsaSer.isHumanReadable() );
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -287,7 +287,7 @@ public class SchemaAwareEntryTest
Attribute attributePWD = entry.get( "userPassword" );
assertEquals( 1, attributePWD.size() );
assertNotNull( attributePWD.get() );
- assertNull( attributePWD.get().getValue() );
+ assertNull( attributePWD.get().getBytes() );
entry.add( "jpegPhoto", BYTES1, BYTES1, BYTES2 );
assertEquals( 2, entry.size() );
@@ -809,7 +809,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "userPassword" ) );
assertEquals( 1, entry.get( "userPassword" ).size() );
- assertNull( entry.get( "userPassword" ).get().getValue() );
+ assertNull( entry.get( "userPassword" ).get().getBytes() );
entry.put( "jpegPhoto", BYTES1, BYTES2, BYTES1 );
assertEquals( 2, entry.size() );
@@ -1051,7 +1051,7 @@ public class SchemaAwareEntryTest
assertEquals( 2, entry.get( "cn" ).size() );
assertTrue( entry.remove( "cn", "test1", "test3" ) );
assertEquals( 1, entry.get( "cn" ).size() );
- assertEquals( "test2", entry.get( "cn" ).get().getString() );
+ assertEquals( "test2", entry.get( "cn" ).get().getValue() );
assertFalse( entry.remove( "cn", "test3" ) );
assertFalse( entry.remove( "void", "whatever" ) );
@@ -1173,9 +1173,7 @@ public class SchemaAwareEntryTest
@Test
public void testSerializeCompleteEntry() throws LdapException, IOException, ClassNotFoundException
{
- Dn dn = new Dn( "ou=system" );
-
- dn.apply( schemaManager );
+ Dn dn = new Dn( schemaManager, "ou=system" );
byte[] password = Strings.getBytesUtf8( "secret" );
Entry entry = new DefaultEntry( dn );
@@ -1227,9 +1225,7 @@ public class SchemaAwareEntryTest
@Test
public void testSerializeEntryWithNoAttribute() throws LdapException, IOException, ClassNotFoundException
{
- Dn dn = new Dn( "ou=system" );
-
- dn.apply( schemaManager );
+ Dn dn = new Dn( schemaManager, "ou=system" );
Entry entry = new DefaultEntry( dn );
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -282,7 +282,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- Value value = new Value( cn, sv1n.getString() );
+ Value value = new Value( cn, sv1n.getValue() );
value.writeExternal( out );
@@ -303,7 +303,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- Value value = new Value( dc, sv2n.getString() );
+ Value value = new Value( dc, sv2n.getValue() );
value.writeExternal( out );
@@ -324,7 +324,7 @@ public class SchemaAwareValueSerializati
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
- Value value = new Value( dc, sv3n.getString() );
+ Value value = new Value( dc, sv3n.getValue() );
value.writeExternal( out );
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=1743011&r1=1743010&r2=1743011&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 Mon May 9 17:22:19 2016
@@ -161,7 +161,7 @@ public final class TestEntryUtils
{
if ( value.isHumanReadable() )
{
- return new Value( Strings.toLowerCaseAscii( value.getString() ) );
+ return new Value( Strings.toLowerCaseAscii( value.getValue() ) );
}
throw new IllegalStateException();
@@ -197,7 +197,9 @@ public final class TestEntryUtils
public boolean isValidSyntax( Object value )
{
- return ( ( String ) value == null ) || ( ( ( String ) value ).length() < 7 );
+ String trimmedValue = Strings.deepTrim( ( String )value );
+
+ return ( trimmedValue == null ) || ( trimmedValue.length() < 7 );
}
} );
Modified: directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java?rev=1743011&r1=1743010&r2=1743011&view=diff
==============================================================================
--- directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java (original)
+++ directory/shared/branches/shared-value/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java Mon May 9 17:22:19 2016
@@ -114,22 +114,22 @@ public class AvaTest
{
Ava ava = new Ava( schemaManager, "CN", " " );
assertEquals( "CN=\\ ", ava.toString() );
- assertEquals( "2.5.4.3=\\ ", ava.getNormName() );
+ assertEquals( "CN=\\ ", ava.getEscaped() );
assertEquals( "CN=\\ ", ava.getName() );
ava = new Ava( schemaManager, " CN ", " " );
assertEquals( " CN =\\ ", ava.toString() );
- assertEquals( "2.5.4.3=\\ ", ava.getNormName() );
+ assertEquals( " CN =\\ ", ava.getEscaped() );
assertEquals( " CN =\\ ", ava.getName() );
ava = new Ava( schemaManager, "cn", " " );
assertEquals( "cn=\\ ", ava.toString() );
- assertEquals( "2.5.4.3=\\ ", ava.getNormName() );
+ assertEquals( "cn=\\ ", ava.getEscaped() );
assertEquals( "cn=\\ ", ava.getName() );
ava = new Ava( schemaManager, " cn ", " " );
assertEquals( " cn =\\ ", ava.toString() );
- assertEquals( "2.5.4.3=\\ ", ava.getNormName() );
+ assertEquals( " cn =\\ ", ava.getEscaped() );
assertEquals( " cn =\\ ", ava.getName() );
}
@@ -160,8 +160,9 @@ public class AvaTest
{
Ava atav = new Ava( schemaManager, "cn", "b" );
assertEquals( "cn=b", atav.toString() );
- assertEquals( "2.5.4.3=b", atav.getNormName() );
+ assertEquals( "cn=b", atav.getEscaped() );
assertEquals( "cn=b", atav.getName() );
+ assertEquals( atav, new Ava( schemaManager, "2.5.4.3", "B" ) );
}
@@ -173,8 +174,9 @@ public class AvaTest
{
Ava atav = new Ava( schemaManager, " CommonName ", " This is a TEST " );
assertEquals( " CommonName =\\ This is a TEST\\ ", atav.toString() );
- assertEquals( "2.5.4.3=this is a test", atav.getNormName() );
+ assertEquals( " CommonName =\\ This is a TEST\\ ", atav.getEscaped() );
assertEquals( " CommonName =\\ This is a TEST\\ ", atav.getName() );
+ assertEquals( atav, new Ava( schemaManager, "cn", "this is a test" ) );
}
@@ -228,9 +230,9 @@ public class AvaTest
Ava ava = new Ava( "OU", "Exemple + Rdn\u00E4 " );
- if ( !"ou=Exemple \\+ Rdn\u00E4\\ ".equals( ava.getNormName() ) )
+ if ( !"OU=Exemple \\+ Rdn\u00E4\\ ".equals( ava.getEscaped() ) )
{
- errors = "\nAva.getNormName fails '" + ava.getNormName() + "'";
+ errors = "\nAva.getEscaped fails '" + ava.getEscaped() + "'";
}
if ( !"ou".equals( ava.getNormType() ) )
@@ -238,9 +240,9 @@ public class AvaTest
errors += "\nAva.getNormType fails '" + ava.getNormType() + "'";
}
- if ( !"Exemple + Rdn\u00E4 ".equals( ava.getValue().getNormValue().toString() ) )
+ if ( !"Exemple + Rdn\u00E4 ".equals( ava.getValue().getValue().toString() ) )
{
- errors += "\nAva.getNormValue fails '" + ava.getValue().getNormValue().toString() + "'";
+ errors += "\nAva.getValue fails '" + ava.getValue().getValue().toString() + "'";
}
if ( !"OU=Exemple \\+ Rdn\u00E4\\ ".equals( ava.getName() ) )
@@ -253,14 +255,14 @@ public class AvaTest
errors += "\nAva.getUpType fails '" + ava.getType() + "'";
}
- if ( !"Exemple + Rdn\u00E4 ".equals( ava.getValue().getString() ) )
+ if ( !"Exemple + Rdn\u00E4 ".equals( ava.getValue().getValue() ) )
{
- errors += "\nAva.getUpValue fails '" + ava.getValue() .getString() + "'";
+ errors += "\nAva.getUpValue fails '" + ava.getValue() .getValue() + "'";
}
- if ( !"ou=Exemple \\+ Rdn\u00E4\\ ".equals( ava.normalize() ) )
+ if ( !"OU=Exemple \\+ Rdn\u00E4\\ ".equals( ava.getEscaped() ) )
{
- errors += "\nAva.normalize fails '" + ava.normalize() + "'";
+ errors += "\nAva.normalize fails '" + ava.getEscaped() + "'";
}
if ( !"OU=Exemple \\+ Rdn\u00E4\\ ".equals( ava.toString() ) )
@@ -283,9 +285,9 @@ public class AvaTest
Ava ava = new Ava( schemaManager, "OU", "Exemple + Rdn\u002B " );
- if ( !"2.5.4.11=exemple \\+ rdn\\+".equals( ava.getNormName() ) )
+ if ( !"OU=Exemple \\+ Rdn\\+\\ ".equals( ava.getEscaped() ) )
{
- errors = "\nAva.getNormName fails '" + ava.getNormName() + "'";
+ errors = "\nAva.getEscaped fails '" + ava.getEscaped() + "'";
}
if ( !"2.5.4.11".equals( ava.getNormType() ) )
@@ -293,9 +295,9 @@ public class AvaTest
errors += "\nAva.getNormType fails '" + ava.getNormType() + "'";
}
- if ( !"exemple + rdn\u002B".equals( ava.getValue().getNormValue().toString() ) )
+ if ( !"Exemple + Rdn+ ".equals( ava.getValue().getValue().toString() ) )
{
- errors += "\nAva.getNormValue fails '" + ava.getValue().getNormValue().toString() + "'";
+ errors += "\nAva.getValue fails '" + ava.getValue().getValue().toString() + "'";
}
if ( !"OU=Exemple \\+ Rdn\\+\\ ".equals( ava.getName() ) )
@@ -308,14 +310,14 @@ public class AvaTest
errors += "\nAva.getUpType fails '" + ava.getType() + "'";
}
- if ( !"Exemple + Rdn\u002B ".equals( ava.getValue().getString() ) )
+ if ( !"Exemple + Rdn+ ".equals( ava.getValue().getValue() ) )
{
- errors += "\nAva.getUpValue fails '" + ava.getValue().getString() + "'";
+ errors += "\nAva.getUpValue fails '" + ava.getValue().getValue() + "'";
}
- if ( !"2.5.4.11=exemple \\+ rdn\\+".equals( ava.normalize() ) )
+ if ( !"OU=Exemple \\+ Rdn\\+\\ ".equals( ava.getEscaped() ) )
{
- errors += "\nAva.normalize fails '" + ava.normalize() + "'";
+ errors += "\nAva.normalize fails '" + ava.getEscaped() + "'";
}
if ( !"OU=Exemple \\+ Rdn\\+\\ ".equals( ava.toString() ) )