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 2011/03/30 16:58:16 UTC
svn commit: r1086976 [1/2] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-jndi/src/main/java/org/apache/di...
Author: elecharny
Date: Wed Mar 30 14:58:15 2011
New Revision: 1086976
URL: http://svn.apache.org/viewvc?rev=1086976&view=rev
Log:
Renamed the Value.get() method to Value.getValue(), to be consistent with the Value.getNormValue() method
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java
directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Wed Mar 30 14:58:15 2011
@@ -76,7 +76,7 @@ public class ServerEntryUtils
for ( Value<?> value: entryAttribute )
{
- attribute.add( value.get() );
+ attribute.add( value.getValue() );
}
return attribute;
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Wed Mar 30 14:58:15 2011
@@ -263,9 +263,9 @@ public class SchemaAwareEntryAttributeTe
for ( Value<?> val : attr )
{
- if ( expected.contains( val.get() ) )
+ if ( expected.contains( val.getValue() ) )
{
- expected.remove( val.get() );
+ expected.remove( val.getValue() );
}
else
{
@@ -298,9 +298,9 @@ public class SchemaAwareEntryAttributeTe
for ( Value<?> val : attr )
{
- if ( expected.contains( val.get() ) )
+ if ( expected.contains( val.getValue() ) )
{
- expected.remove( val.get() );
+ expected.remove( val.getValue() );
}
else
{
@@ -329,7 +329,7 @@ public class SchemaAwareEntryAttributeTe
Value<?> value = attr.get();
assertTrue( value instanceof StringValue );
- assertNull( ( ( StringValue ) value ).get() );
+ assertNull( ( ( StringValue ) value ).getValue() );
}
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Wed Mar 30 14:58:15 2011
@@ -293,7 +293,7 @@ public class SchemaAwareEntryTest
EntryAttribute attributePWD = entry.get( "userPassword" );
assertEquals( 1, attributePWD.size() );
assertNotNull( attributePWD.get() );
- assertNull( attributePWD.get().get() );
+ assertNull( attributePWD.get().getValue() );
entry.clear();
@@ -382,7 +382,7 @@ public class SchemaAwareEntryTest
EntryAttribute attributeCN = entry.get( "dc" );
assertEquals( 1, attributeCN.size() );
assertNotNull( attributeCN.get() );
- assertNull( attributeCN.get().get() );
+ assertNull( attributeCN.get().getValue() );
Value<String> value1 = new StringValue( atCN, "test1" );
Value<String> value2 = new StringValue( atCN, "test2" );
@@ -2423,7 +2423,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "userPassword" ) );
assertEquals( 1, entry.get( "userPassword" ).size() );
- assertNull( entry.get( "userPassword" ).get().get() );
+ assertNull( entry.get( "userPassword" ).get().getValue() );
replaced = entry.put( "UserPassword", BYTES1 );
assertNotNull( replaced );
@@ -2432,7 +2432,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "userPassword" ) );
assertEquals( 1, entry.get( "userPassword" ).size() );
- assertNotNull( entry.get( "userPassword" ).get().get() );
+ assertNotNull( entry.get( "userPassword" ).get().getValue() );
assertTrue( entry.get( "userPassword" ).contains( BYTES1 ) );
replaced = entry.put( "userPassword", BYTES1, BYTES2, BYTES1 );
@@ -2498,7 +2498,7 @@ public class SchemaAwareEntryTest
assertEquals( 2, entry.size() );
assertNotNull( entry.get( "cn" ) );
assertEquals( 1, entry.get( "cn" ).size() );
- assertNotNull( entry.get( "cn" ).get().get() );
+ assertNotNull( entry.get( "cn" ).get().getValue() );
assertTrue( entry.get( "cn" ).contains( "test" ) );
replaced = entry.put( "cN", "test1", "test2", "test1" );
@@ -2568,7 +2568,7 @@ public class SchemaAwareEntryTest
assertNotNull( entry.get( "domainComponent" ) );
assertEquals( 1, entry.get( "domainComponent" ).size() );
assertNotNull( entry.get( "domainComponent" ).get() );
- assertNull( entry.get( "domainComponent" ).get().get() );
+ assertNull( entry.get( "domainComponent" ).get().getValue() );
entry.removeAttributes( "dc" );
replaced = entry.put( "DC", strValue3 );
@@ -2576,7 +2576,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "dc" ) );
assertEquals( 1, entry.get( "dc" ).size() );
- assertNotNull( entry.get( "dc" ).get().get() );
+ assertNotNull( entry.get( "dc" ).get().getValue() );
assertTrue( entry.get( "dc" ).contains( strValue3 ) );
replaced = entry.put( "dC", strValue1, strValue2, strValue1 );
@@ -2693,7 +2693,7 @@ public class SchemaAwareEntryTest
entry.put( atDC, ( String ) null );
assertEquals( 1, entry.size() );
assertEquals( "dc", entry.get( atDC ).getUpId() );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Check that we can't use invalid arguments
try
@@ -2750,7 +2750,7 @@ public class SchemaAwareEntryTest
entry.put( atPwd, ( byte[] ) null );
assertEquals( 1, entry.size() );
assertEquals( "userPassword", entry.get( atPwd ).getUpId() );
- assertNull( entry.get( atPwd ).get().get() );
+ assertNull( entry.get( atPwd ).get().getValue() );
// Check that we can't use invalid arguments
try
@@ -2875,7 +2875,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "dc", entry.get( atDC ).getUpId() );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Check that we can't use invalid arguments
try
@@ -2938,7 +2938,7 @@ public class SchemaAwareEntryTest
entry.put( "userPassword", ( byte[] ) null );
assertEquals( 1, entry.size() );
assertEquals( "userPassword", entry.get( atPassword ).getUpId() );
- assertNull( entry.get( atPassword ).get().get() );
+ assertNull( entry.get( atPassword ).get().getValue() );
// Check that we can't use invalid arguments
try
@@ -3012,21 +3012,21 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "domaincomponent", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Check that we can use a null AttributeType
entry.put( "domaincomponent", ( AttributeType ) null, ( String ) null );
assertEquals( 1, entry.size() );
assertEquals( "domaincomponent", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Test that we can use a null upId
entry.put( null, atDC, ( String ) null );
assertEquals( 1, entry.size() );
assertEquals( "dc", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
try
{
@@ -3078,21 +3078,21 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "userPassword", entry.get( atPassword ).getUpId() );
assertTrue( entry.containsAttribute( "userPassword" ) );
- assertNull( entry.get( atPassword ).get().get() );
+ assertNull( entry.get( atPassword ).get().getValue() );
// Check that we can use a null AttributeType
entry.put( "userPassword", ( AttributeType ) null, ( byte[] ) null );
assertEquals( 1, entry.size() );
assertEquals( "userPassword", entry.get( atPassword ).getUpId() );
assertTrue( entry.containsAttribute( "userPassword" ) );
- assertNull( entry.get( atPassword ).get().get() );
+ assertNull( entry.get( atPassword ).get().getValue() );
// Test that we can use a null upId
entry.put( null, atPassword, ( byte[] ) null );
assertEquals( 1, entry.size() );
assertEquals( "userPassword", entry.get( atPassword ).getUpId() );
assertTrue( entry.containsAttribute( "userPassword" ) );
- assertNull( entry.get( atPassword ).get().get() );
+ assertNull( entry.get( atPassword ).get().getValue() );
// Test that if we use an upId which is not compatible
// with the AT, it is changed to the AT default name
@@ -3151,7 +3151,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "domainComponent", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Check that we can use a null AttributeType
entry.put( "domainComponent", ( AttributeType ) null, ( Value<?> ) null );
@@ -3159,14 +3159,14 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "domainComponent", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Test that we can use a null upId
entry.put( null, atDC, ( Value<?> ) null );
assertEquals( 1, entry.size() );
assertEquals( "dc", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Test that we can't use an upId which is not compatible
// with the AT
@@ -3222,7 +3222,7 @@ public class SchemaAwareEntryTest
assertEquals( 1, entry.size() );
assertEquals( "domainComponent", entry.get( atDC ).getUpId() );
assertTrue( entry.containsAttribute( "dc" ) );
- assertNull( entry.get( atDC ).get().get() );
+ assertNull( entry.get( atDC ).get().getValue() );
// Test that we can add some new attributes with values
Value<String> test1 = new StringValue( atDC, "test1" );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Wed Mar 30 14:58:15 2011
@@ -603,7 +603,7 @@ public abstract class ServerDirContext e
if ( doRdnPut )
{
- attributes.put( atav.getNormType(), atav.getUpValue().get() );
+ attributes.put( atav.getNormType(), atav.getUpValue().getValue() );
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Wed Mar 30 14:58:15 2011
@@ -365,7 +365,7 @@ public class AuthenticationInterceptor e
try
{
- check( username, userPassword.get(), policyConfig );
+ check( username, userPassword.getValue(), policyConfig );
}
catch ( PasswordPolicyException e )
{
@@ -399,7 +399,7 @@ public class AuthenticationInterceptor e
if ( policyConfig.getPwdInHistory() > 0 )
{
EntryAttribute pwdHistoryAt = new DefaultEntryAttribute( AT_PWD_HISTORY );
- byte[] pwdHistoryVal = new PasswordHistory( pwdChangedTime, userPassword.get() ).getHistoryValue();
+ byte[] pwdHistoryVal = new PasswordHistory( pwdChangedTime, userPassword.getValue() ).getHistoryValue();
pwdHistoryAt.add( pwdHistoryVal );
entry.add( pwdHistoryAt );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Wed Mar 30 14:58:15 2011
@@ -300,7 +300,7 @@ public class LeafEvaluator implements Ev
{
Value<?> normValue = normalizer.normalize( val );
- if ( 0 == comparator.compare( normValue.get(), filterValue.get() ) )
+ if ( 0 == comparator.compare( normValue.getValue(), filterValue.getValue() ) )
{
return true;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java Wed Mar 30 14:58:15 2011
@@ -134,12 +134,12 @@ public class PasswordHashingInterceptor
BinaryValue userPassword = ( BinaryValue ) pwdAt.get();
// check if the given password is already hashed
- LdapSecurityConstants existingAlgo = PasswordUtil.findAlgorithm( userPassword.get() );
+ LdapSecurityConstants existingAlgo = PasswordUtil.findAlgorithm( userPassword.getValue() );
// if there exists NO algorithm, then hash the password
if ( existingAlgo == null )
{
- byte[] hashedPassword = PasswordUtil.createStoragePassword( userPassword.get(), algorithm );
+ byte[] hashedPassword = PasswordUtil.createStoragePassword( userPassword.getValue(), algorithm );
pwdAt.clear();
pwdAt.add( hashedPassword );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Wed Mar 30 14:58:15 2011
@@ -1751,7 +1751,7 @@ public class SchemaInterceptor extends B
try
{
- syntaxChecker.assertSyntax( value.get() );
+ syntaxChecker.assertSyntax( value.getValue() );
}
catch ( Exception ne )
{
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Wed Mar 30 14:58:15 2011
@@ -630,7 +630,7 @@ public class JdbmIndex<K, O> extends Abs
else
{
normalized = ( K ) attributeType.getEquality().getNormalizer().normalize(
- new BinaryValue( ( byte[] ) attrVal ) ).get();
+ new BinaryValue( ( byte[] ) attrVal ) ).getValue();
}
// Double map it so if we use an already normalized
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Wed Mar 30 14:58:15 2011
@@ -408,7 +408,7 @@ public class JdbmStore<E> extends Abstra
{
for ( Value<?> value : entryAttr )
{
- userIdx.add( value.get(), id );
+ userIdx.add( value.getValue(), id );
}
// Adds only those attributes that are indexed
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Wed Mar 30 14:58:15 2011
@@ -1003,7 +1003,7 @@ public abstract class AbstractStore<E, I
for ( Value<?> value : attribute )
{
- idx.add( value.get(), id );
+ idx.add( value.getValue(), id );
}
// Adds only those attributes that are indexed
@@ -1148,7 +1148,7 @@ public abstract class AbstractStore<E, I
// the entry via the enumeration - it's in there as is for sure
for ( Value<?> value : attribute )
{
- ( ( Index ) index ).drop( value.get(), id );
+ ( ( Index ) index ).drop( value.getValue(), id );
}
presenceIdx.drop( attributeOid, id );
@@ -1193,7 +1193,7 @@ public abstract class AbstractStore<E, I
for ( Ava newAtav : newRdn )
{
String newNormType = newAtav.getNormType();
- Object newNormValue = newAtav.getNormValue().get();
+ Object newNormValue = newAtav.getNormValue().getValue();
AttributeType newRdnAttrType = schemaManager.lookupAttributeTypeRegistry( newNormType );
@@ -1539,7 +1539,7 @@ public abstract class AbstractStore<E, I
for ( Value<?> value : mods )
{
- ( ( Index ) index ).add( value.get(), id );
+ ( ( Index ) index ).add( value.getValue(), id );
}
// If the attr didn't exist for this id add it to existence index
@@ -1614,7 +1614,7 @@ public abstract class AbstractStore<E, I
for ( Value<?> value : mods )
{
- ( ( Index<Object, E, ID> ) index ).add( value.get(), id );
+ ( ( Index<Object, E, ID> ) index ).add( value.getValue(), id );
}
/*
@@ -1714,7 +1714,7 @@ public abstract class AbstractStore<E, I
{
for ( Value<?> value : mods )
{
- ( ( Index ) index ).drop( value.get(), id );
+ ( ( Index ) index ).drop( value.getValue(), id );
}
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Wed Mar 30 14:58:15 2011
@@ -288,7 +288,7 @@ public class AvlIndex<K, O> extends Abst
}
else
{
- return ( K ) normalizer.normalize( new BinaryValue( ( byte[] ) attrVal ) ).get();
+ return ( K ) normalizer.normalize( new BinaryValue( ( byte[] ) attrVal ) ).getValue();
}
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Wed Mar 30 14:58:15 2011
@@ -71,7 +71,7 @@ public class ApproximateCursor<V, ID ext
if ( db.hasIndexOn( attributeType ) )
{
Index<V, Entry, ID> index = ( Index<V, Entry, ID> ) db.getIndex( attributeType );
- userIdxCursor = index.forwardCursor( value.get() );
+ userIdxCursor = index.forwardCursor( value.getValue() );
ndnIdxCursor = null;
}
else
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java Wed Mar 30 14:58:15 2011
@@ -131,7 +131,7 @@ public class ApproximateEvaluator<T, ID
{
if ( idx != null )
{
- return idx.forward( node.getValue().get(), indexEntry.getId() );
+ return idx.forward( node.getValue().getValue(), indexEntry.getId() );
}
Entry entry = indexEntry.getObject();
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Wed Mar 30 14:58:15 2011
@@ -277,7 +277,7 @@ public class DefaultOptimizer<E, ID exte
if ( db.hasIndexOn( node.getAttributeType() ) )
{
Index<V, E, ID> idx = ( Index<V, E, ID> ) db.getIndex( node.getAttributeType() );
- return idx.count( node.getValue().get() );
+ return idx.count( node.getValue().getValue() );
}
// count for non-indexed attribute is unknown so we presume da worst
@@ -302,11 +302,11 @@ public class DefaultOptimizer<E, ID exte
Index<V, E, ID> idx = ( Index<V, E, ID> ) db.getIndex( node.getAttributeType() );
if ( isGreaterThan )
{
- return idx.greaterThanCount( node.getValue().get() );
+ return idx.greaterThanCount( node.getValue().getValue() );
}
else
{
- return idx.lessThanCount( node.getValue().get() );
+ return idx.lessThanCount( node.getValue().getValue() );
}
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Wed Mar 30 14:58:15 2011
@@ -70,7 +70,7 @@ public class EqualityCursor<V, ID extend
if ( db.hasIndexOn( attributeType ) )
{
Index<V, Entry, ID> userIndex = ( Index<V, Entry, ID> ) db.getIndex( attributeType );
- userIdxCursor = userIndex.forwardCursor( value.get() );
+ userIdxCursor = userIndex.forwardCursor( value.getValue() );
ndnIdxCursor = null;
}
else
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java Wed Mar 30 14:58:15 2011
@@ -96,7 +96,7 @@ public class EqualityEvaluator<T, ID ext
{
if ( idx != null )
{
- return idx.forward( node.getValue().get(), indexEntry.getId() );
+ return idx.forward( node.getValue().getValue(), indexEntry.getId() );
}
Entry entry = indexEntry.getObject();
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Wed Mar 30 14:58:15 2011
@@ -107,7 +107,7 @@ public class GreaterEqCursor<V, ID exten
* underlying userIdx Cursor position the element.
*/
if ( greaterEqEvaluator.getComparator()
- .compare( value, greaterEqEvaluator.getExpression().getValue().get() ) <= 0 )
+ .compare( value, greaterEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
{
beforeFirst();
return;
@@ -130,7 +130,7 @@ public class GreaterEqCursor<V, ID exten
if ( userIdxCursor != null )
{
int comparedValue = greaterEqEvaluator.getComparator().compare( value,
- greaterEqEvaluator.getExpression().getValue().get() );
+ greaterEqEvaluator.getExpression().getValue().getValue() );
/*
* First we need to check and make sure this element is within
@@ -179,7 +179,7 @@ public class GreaterEqCursor<V, ID exten
* underlying userIdx Cursor position the element.
*/
if ( greaterEqEvaluator.getComparator().compare( element.getValue(),
- greaterEqEvaluator.getExpression().getValue().get() ) <= 0 )
+ greaterEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
{
beforeFirst();
return;
@@ -202,7 +202,7 @@ public class GreaterEqCursor<V, ID exten
if ( userIdxCursor != null )
{
int comparedValue = greaterEqEvaluator.getComparator().compare( element.getValue(),
- greaterEqEvaluator.getExpression().getValue().get() );
+ greaterEqEvaluator.getExpression().getValue().getValue() );
/*
* First we need to check and make sure this element is within
@@ -242,7 +242,7 @@ public class GreaterEqCursor<V, ID exten
if ( userIdxCursor != null )
{
IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
- advanceTo.setValue( ( V ) greaterEqEvaluator.getExpression().getValue().get() );
+ advanceTo.setValue( ( V ) greaterEqEvaluator.getExpression().getValue().getValue() );
userIdxCursor.before( advanceTo );
}
else
@@ -301,7 +301,7 @@ public class GreaterEqCursor<V, ID exten
checkNotClosed( "previous()" );
IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
if ( greaterEqEvaluator.getComparator().compare( candidate.getValue(),
- greaterEqEvaluator.getExpression().getValue().get() ) >= 0 )
+ greaterEqEvaluator.getExpression().getValue().getValue() ) >= 0 )
{
return available = true;
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java Wed Mar 30 14:58:15 2011
@@ -91,7 +91,7 @@ public class GreaterEqEvaluator<T, ID ex
{
if ( idx != null && idx.isDupsEnabled() )
{
- return idx.reverseGreaterOrEq( indexEntry.getId(), node.getValue().get() );
+ return idx.reverseGreaterOrEq( indexEntry.getId(), node.getValue().getValue() );
}
Entry entry = indexEntry.getObject();
@@ -154,7 +154,7 @@ public class GreaterEqEvaluator<T, ID ex
{
if ( idx != null && idx.isDupsEnabled() )
{
- return idx.reverseGreaterOrEq( id, node.getValue().get() );
+ return idx.reverseGreaterOrEq( id, node.getValue().getValue() );
}
return evaluateEntry( db.lookup( id ) );
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Wed Mar 30 14:58:15 2011
@@ -112,7 +112,7 @@ public class LessEqCursor<V, ID extends
*/
//noinspection unchecked
int compareValue = lessEqEvaluator.getComparator().compare( value,
- lessEqEvaluator.getExpression().getValue().get() );
+ lessEqEvaluator.getExpression().getValue().getValue() );
if ( compareValue > 0 )
{
@@ -156,7 +156,7 @@ public class LessEqCursor<V, ID extends
* before() method of the userIdxCursor.
*/
int compareValue = lessEqEvaluator.getComparator().compare( element.getValue(),
- lessEqEvaluator.getExpression().getValue().get() );
+ lessEqEvaluator.getExpression().getValue().getValue() );
if ( compareValue > 0 )
{
@@ -187,7 +187,7 @@ public class LessEqCursor<V, ID extends
if ( userIdxCursor != null )
{
int comparedValue = lessEqEvaluator.getComparator().compare( value,
- lessEqEvaluator.getExpression().getValue().get() );
+ lessEqEvaluator.getExpression().getValue().getValue() );
/*
* First we need to check and make sure this element is within
@@ -223,7 +223,7 @@ public class LessEqCursor<V, ID extends
if ( userIdxCursor != null )
{
int comparedValue = lessEqEvaluator.getComparator().compare( element.getValue(),
- lessEqEvaluator.getExpression().getValue().get() );
+ lessEqEvaluator.getExpression().getValue().getValue() );
/*
* First we need to check and make sure this element is within
@@ -277,7 +277,7 @@ public class LessEqCursor<V, ID extends
{
IndexEntry<V, Entry, ID> advanceTo = new ForwardIndexEntry<V, Entry, ID>();
//noinspection unchecked
- advanceTo.setValue( ( V ) lessEqEvaluator.getExpression().getValue().get() );
+ advanceTo.setValue( ( V ) lessEqEvaluator.getExpression().getValue().getValue() );
userIdxCursor.after( advanceTo );
}
else
@@ -352,7 +352,7 @@ public class LessEqCursor<V, ID extends
checkNotClosed( "next()" );
IndexEntry<?, Entry, ID> candidate = userIdxCursor.get();
if ( lessEqEvaluator.getComparator().compare( candidate.getValue(),
- lessEqEvaluator.getExpression().getValue().get() ) <= 0 )
+ lessEqEvaluator.getExpression().getValue().getValue() ) <= 0 )
{
return available = true;
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java Wed Mar 30 14:58:15 2011
@@ -91,7 +91,7 @@ public class LessEqEvaluator<T, ID exten
{
if ( ( idx != null ) && idx.isDupsEnabled() )
{
- return idx.reverseLessOrEq( id, node.getValue().get() );
+ return idx.reverseLessOrEq( id, node.getValue().getValue() );
}
return evaluateEntry( db.lookup( id ) );
@@ -102,7 +102,7 @@ public class LessEqEvaluator<T, ID exten
{
if ( ( idx != null ) && idx.isDupsEnabled() )
{
- return idx.reverseLessOrEq( indexEntry.getId(), node.getValue().get() );
+ return idx.reverseLessOrEq( indexEntry.getId(), node.getValue().getValue() );
}
Entry entry = indexEntry.getObject();
Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Wed Mar 30 14:58:15 2011
@@ -91,7 +91,7 @@ public class AttributesTableModel extend
for ( Value<?> value:attribute )
{
keyList.add( attribute.getId() );
- valList.add( value.get() );
+ valList.add( value.getValue() );
}
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Wed Mar 30 14:58:15 2011
@@ -150,7 +150,7 @@ public class SearchResultEntryDsml
for ( Value<?> value : attribute )
{
- if ( ParserUtils.needsBase64Encoding( value.get() ) )
+ if ( ParserUtils.needsBase64Encoding( value.getValue() ) )
{
Namespace xsdNamespace = new Namespace( ParserUtils.XSD, ParserUtils.XML_SCHEMA_URI );
Namespace xsiNamespace = new Namespace( ParserUtils.XSI, ParserUtils.XML_SCHEMA_INSTANCE_URI );
@@ -158,7 +158,7 @@ public class SearchResultEntryDsml
attributeElement.getDocument().getRootElement().add( xsiNamespace );
Element valueElement = attributeElement.addElement( "value" ).addText(
- ParserUtils.base64Encode( value.get() ) );
+ ParserUtils.base64Encode( value.getValue() ) );
valueElement.addAttribute( new QName( "type", xsiNamespace ), ParserUtils.XSD + ":"
+ ParserUtils.BASE64BINARY );
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Wed Mar 30 14:58:15 2011
@@ -169,7 +169,7 @@ public class AddRequestDsml
// Looping on Values
for ( Value<?> value : attribute )
{
- if ( ParserUtils.needsBase64Encoding( value.get() ) )
+ if ( ParserUtils.needsBase64Encoding( value.getValue() ) )
{
Namespace xsdNamespace = new Namespace( "xsd", ParserUtils.XML_SCHEMA_URI );
Namespace xsiNamespace = new Namespace( "xsi", ParserUtils.XML_SCHEMA_INSTANCE_URI );
@@ -177,7 +177,7 @@ public class AddRequestDsml
attributeElement.getDocument().getRootElement().add( xsiNamespace );
Element valueElement = attributeElement.addElement( "value" ).addText(
- ParserUtils.base64Encode( value.get() ) );
+ ParserUtils.base64Encode( value.getValue() ) );
valueElement
.addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java Wed Mar 30 14:58:15 2011
@@ -70,11 +70,11 @@ public class AttributeValueAssertion
}
else if ( object instanceof StringValue)
{
- return ( (StringValue) object ).get();
+ return ( (StringValue) object ).getValue();
}
else if ( object instanceof BinaryValue )
{
- return Strings.dumpBytes(((BinaryValue) object).get());
+ return Strings.dumpBytes(((BinaryValue) object).getValue());
}
else
{
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Wed Mar 30 14:58:15 2011
@@ -168,9 +168,9 @@ public class ModifyRequestDsml
{
Value<?> value = iterator.next();
- if ( value.get() != null )
+ if ( value.getValue() != null )
{
- if ( ParserUtils.needsBase64Encoding( value.get() ) )
+ if ( ParserUtils.needsBase64Encoding( value.getValue() ) )
{
Namespace xsdNamespace = new Namespace( "xsd", ParserUtils.XML_SCHEMA_URI );
Namespace xsiNamespace = new Namespace( "xsi", ParserUtils.XML_SCHEMA_INSTANCE_URI );
@@ -178,7 +178,7 @@ public class ModifyRequestDsml
element.getDocument().getRootElement().add( xsiNamespace );
Element valueElement = modElement.addElement( "value" ).addText(
- ParserUtils.base64Encode( value.get() ) );
+ ParserUtils.base64Encode( value.getValue() ) );
valueElement.addAttribute( new QName( "type", xsiNamespace ), "xsd:"
+ ParserUtils.BASE64BINARY );
}
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Wed Mar 30 14:58:15 2011
@@ -328,7 +328,7 @@ public class CompareRequestTest extends
assertEquals( "sn", compareRequest.getAttributeId() );
- assertEquals( "Johnson", compareRequest.getAssertionValue().get() );
+ assertEquals( "Johnson", compareRequest.getAssertionValue().getValue() );
}
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Wed Mar 30 14:58:15 2011
@@ -336,7 +336,7 @@ public class EntryTest
EntryAttribute attributePWD = entry.get( "userPassword" );
assertEquals( 1, attributePWD.size() );
assertNotNull( attributePWD.get() );
- assertNull( attributePWD.get().get() );
+ assertNull( attributePWD.get().getValue() );
entry.add( "jpegPhoto", BYTES1, BYTES1, BYTES2 );
assertEquals( 2, entry.size() );
@@ -361,7 +361,7 @@ public class EntryTest
EntryAttribute attributeCN = entry.get( "cn" );
assertEquals( 1, attributeCN.size() );
assertNotNull( attributeCN.get() );
- assertNull( attributeCN.get().get() );
+ assertNull( attributeCN.get().getValue() );
entry.add( "sn", "test", "test", "TEST" );
assertEquals( 2, entry.size() );
@@ -388,7 +388,7 @@ public class EntryTest
EntryAttribute attributeCN = entry.get( "cn" );
assertEquals( 1, attributeCN.size() );
assertNotNull( attributeCN.get() );
- assertNull( attributeCN.get().get() );
+ assertNull( attributeCN.get().getValue() );
Value<String> value1 = new StringValue( "test1" );
Value<String> value2 = new StringValue( "test2" );
@@ -861,7 +861,7 @@ public class EntryTest
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "userPassword" ) );
assertEquals( 1, entry.get( "userPassword" ).size() );
- assertNull( entry.get( "userPassword" ).get().get() );
+ assertNull( entry.get( "userPassword" ).get().getValue() );
entry.put( "jpegPhoto", BYTES1, BYTES2, BYTES1 );
assertEquals( 2, entry.size() );
@@ -907,7 +907,7 @@ public class EntryTest
assertEquals( 1, entry.size() );
assertNotNull( "sn", entry.get( "sn" ) );
assertEquals( 1, entry.get( "sn" ).size() );
- assertNull( entry.get( "sn" ).get().get() );
+ assertNull( entry.get( "sn" ).get().getValue() );
entry.put( "ObjectClass", "top", "person", "top" );
assertEquals( 2, entry.size() );
@@ -963,7 +963,7 @@ public class EntryTest
assertEquals( 1, entry.size() );
assertNotNull( "sn", entry.get( "sn" ) );
assertEquals( 1, entry.get( "sn" ).size() );
- assertNull( entry.get( "sn" ).get().get() );
+ assertNull( entry.get( "sn" ).get().getValue() );
entry.clear();
@@ -984,7 +984,7 @@ public class EntryTest
assertEquals( 1, entry.size() );
assertNotNull( "userpassword", entry.get( "userpassword" ) );
assertEquals( 1, entry.get( "userpassword" ).size() );
- assertNull( entry.get( "userpassword" ).get().get() );
+ assertNull( entry.get( "userpassword" ).get().getValue() );
entry.clear();
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java Wed Mar 30 14:58:15 2011
@@ -2556,7 +2556,7 @@ public class DnTest
assertEquals( "cn=loopback+iphostnumber=127.0.0.1,ou=Hosts,dc=mygfs,dc=com", dn1.getNormName() );
assertEquals( "cn=loopback+ipHostNumber=127.0.0.1", dn1.getRdn().getName() );
assertEquals( "cn=loopback+iphostnumber=127.0.0.1", dn1.getRdn().getNormName() );
- assertEquals( "127.0.0.1", dn1.getRdn().getAva( "ipHostNumber" ).getUpValue().get() );
+ assertEquals( "127.0.0.1", dn1.getRdn().getAva( "ipHostNumber" ).getUpValue().getValue() );
// numeric OID with suffix
Dn dn2 = new Dn( "cn=loopback+ipHostNumber=X127.0.0.1,ou=Hosts,dc=mygfs,dc=com" );
@@ -2602,10 +2602,10 @@ public class DnTest
assertEquals( "2.5.4.11=example", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
- assertEquals( "example", atav.getNormValue().get() );
+ assertEquals( "example", atav.getNormValue().getValue() );
assertEquals( "ou", atav.getUpType() );
- assertEquals( "Example", atav.getUpValue().get() );
+ assertEquals( "Example", atav.getUpValue().getValue() );
assertEquals( " ou = Example ", atav.getUpName() );
}
@@ -2633,10 +2633,10 @@ public class DnTest
assertEquals( "2.5.4.11=example", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
- assertEquals( "example", atav.getNormValue().get() );
+ assertEquals( "example", atav.getNormValue().getValue() );
assertEquals( "ou", atav.getUpType() );
- assertEquals( "Example", atav.getUpValue().get() );
+ assertEquals( "Example", atav.getUpValue().getValue() );
assertEquals( " ou = Example ", atav.getUpName() );
@@ -2645,7 +2645,7 @@ public class DnTest
// The second ATAV
for ( Ava ava : rdn )
{
- if ( "example".equals( ava.getNormValue().get() ) )
+ if ( "example".equals( ava.getNormValue().getValue() ) )
{
// Skip the first one
continue;
@@ -2653,10 +2653,10 @@ public class DnTest
assertEquals( "2.5.4.11=test", ava.getNormName() );
assertEquals( "2.5.4.11", ava.getNormType() );
- assertEquals( "test", ava.getNormValue().get() );
+ assertEquals( "test", ava.getNormValue().getValue() );
assertEquals( "ou", ava.getUpType() );
- assertEquals( "TEST", ava.getUpValue().get() );
+ assertEquals( "TEST", ava.getUpValue().getValue() );
assertEquals( " ou = TEST ", ava.getUpName() );
}
}
@@ -2683,10 +2683,10 @@ public class DnTest
assertEquals( "2.5.4.11=ex\\+mple", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
- assertEquals( "ex+mple", atav.getNormValue().get() );
+ assertEquals( "ex+mple", atav.getNormValue().getValue() );
assertEquals( "ou", atav.getUpType() );
- assertEquals( "Ex+mple", atav.getUpValue().get() );
+ assertEquals( "Ex+mple", atav.getUpValue().getValue() );
assertEquals( " ou = Ex\\+mple ", atav.getUpName() );
}
@@ -2722,15 +2722,15 @@ public class DnTest
assertEquals( "ou", atav.getNormType() );
assertEquals( "OU", atav.getUpType() );
- assertEquals( "Ex+mple", atav.getUpValue().get() );
- assertEquals( "Ex+mple", atav.getNormValue().get() );
+ assertEquals( "Ex+mple", atav.getUpValue().getValue() );
+ assertEquals( "Ex+mple", atav.getNormValue().getValue() );
assertEquals( 2, rdn.size() );
// The second ATAV
for ( Ava ava : rdn )
{
- if ( "Ex+mple".equals( ava.getNormValue().get() ) )
+ if ( "Ex+mple".equals( ava.getNormValue().getValue() ) )
{
// Skip the first one
continue;
@@ -2742,8 +2742,8 @@ public class DnTest
assertEquals( "ou", ava.getUpType() );
assertEquals( "ou", ava.getNormType() );
- assertEquals( "T+ST ", ava.getUpValue().get() );
- assertEquals( "T+ST ", ava.getNormValue().get() );
+ assertEquals( "T+ST ", ava.getUpValue().getValue() );
+ assertEquals( "T+ST ", ava.getNormValue().getValue() );
}
// ------------------------------------------------------------------
@@ -2773,15 +2773,15 @@ public class DnTest
assertEquals( "2.5.4.11", atav.getNormType() );
assertEquals( "OU", atav.getUpType() );
- assertEquals( "Ex+mple", atav.getUpValue().get() );
- assertEquals( "ex+mple", atav.getNormValue().get() );
+ assertEquals( "Ex+mple", atav.getUpValue().getValue() );
+ assertEquals( "ex+mple", atav.getNormValue().getValue() );
assertEquals( 2, rdn.size() );
// The second ATAV
for ( Ava ava : rdn )
{
- if ( "ex+mple".equals( ava.getNormValue().get() ) )
+ if ( "ex+mple".equals( ava.getNormValue().getValue() ) )
{
// Skip the first one
continue;
@@ -2793,8 +2793,8 @@ public class DnTest
assertEquals( "ou", ava.getUpType() );
assertEquals( "2.5.4.11", ava.getNormType() );
- assertEquals( "T+ST ", ava.getUpValue().get() );
- assertEquals( "t+st", ava.getNormValue().get() );
+ assertEquals( "T+ST ", ava.getUpValue().getValue() );
+ assertEquals( "t+st", ava.getNormValue().getValue() );
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java Wed Mar 30 14:58:15 2011
@@ -70,11 +70,11 @@ public class AttributeValueAssertion
}
else if ( object instanceof StringValue)
{
- return ( (StringValue) object ).get();
+ return ( (StringValue) object ).getValue();
}
else if ( object instanceof BinaryValue )
{
- return Strings.dumpBytes(((BinaryValue) object).get());
+ return Strings.dumpBytes(((BinaryValue) object).getValue());
}
else
{
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Wed Mar 30 14:58:15 2011
@@ -162,9 +162,9 @@ public class AddRequestTest extends Abst
for ( Value<?> value : attribute )
{
- assertTrue( vals.contains( value.get() ) );
+ assertTrue( vals.contains( value.getValue() ) );
- vals.remove( value.get() );
+ vals.remove( value.getValue() );
}
attribute = entry.get( "attrs" );
@@ -175,9 +175,9 @@ public class AddRequestTest extends Abst
for ( Value<?> value : attribute )
{
- assertTrue( vals.contains( value.get() ) );
+ assertTrue( vals.contains( value.getValue() ) );
- vals.remove( value.get() );
+ vals.remove( value.getValue() );
}
// Check the encoding
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Wed Mar 30 14:58:15 2011
@@ -417,7 +417,7 @@ public class SearchRequestMatchingRuleAs
assertEquals( "test", extensibleNode.getMatchingRuleId() );
assertNull( extensibleNode.getAttribute() );
- assertNull( extensibleNode.getValue().get() );
+ assertNull( extensibleNode.getValue().getValue() );
assertFalse( extensibleNode.hasDnAttributes() );
List<String> attributes = searchRequest.getAttributes();
Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Wed Mar 30 14:58:15 2011
@@ -162,9 +162,9 @@ public class AddRequestTest extends Abst
for ( Value<?> value : attribute )
{
- assertTrue( vals.contains( value.get() ) );
+ assertTrue( vals.contains( value.getValue() ) );
- vals.remove( value.get() );
+ vals.remove( value.getValue() );
}
attribute = entry.get( "attrs" );
@@ -175,9 +175,9 @@ public class AddRequestTest extends Abst
for ( Value<?> value : attribute )
{
- assertTrue( vals.contains( value.get() ) );
+ assertTrue( vals.contains( value.getValue() ) );
- vals.remove( value.get() );
+ vals.remove( value.getValue() );
}
// Check the encoding
Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Wed Mar 30 14:58:15 2011
@@ -417,7 +417,7 @@ public class SearchRequestMatchingRuleAs
assertEquals( "test", extensibleNode.getMatchingRuleId() );
assertNull( extensibleNode.getAttribute() );
- assertNull( extensibleNode.getValue().get() );
+ assertNull( extensibleNode.getValue().getValue() );
assertFalse( extensibleNode.hasDnAttributes() );
List<String> attributes = searchRequest.getAttributes();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java Wed Mar 30 14:58:15 2011
@@ -1104,7 +1104,7 @@ public final class AttributeUtils
for ( Iterator<Value<?>> valueIterator = entryAttribute.iterator(); valueIterator.hasNext(); )
{
Value<?> value = valueIterator.next();
- attribute.add( value.get() );
+ attribute.add( value.getValue() );
}
return attribute;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java Wed Mar 30 14:58:15 2011
@@ -328,7 +328,7 @@ public class BinaryValue extends Abstrac
/**
* {@inheritDoc}
*/
- public byte[] get()
+ public byte[] getValue()
{
if ( wrappedValue == null )
{
@@ -370,7 +370,7 @@ public class BinaryValue extends Abstrac
*/
public byte[] getBytes()
{
- return get();
+ return getValue();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java Wed Mar 30 14:58:15 2011
@@ -108,7 +108,7 @@ public class StringValue extends Abstrac
/**
* {@inheritDoc}
*/
- public String get()
+ public String getValue()
{
// The String is immutable, we can safely return the internal
// object without copying it.
@@ -331,7 +331,7 @@ public class StringValue extends Abstrac
else
{
Normalizer normalizer = attributeType.getEquality().getNormalizer();
- return comparator.compare( normalizer.normalize( get() ), normalizer.normalize( other.get() ) ) == 0;
+ return comparator.compare( normalizer.normalize( getValue() ), normalizer.normalize( other.getValue() ) ) == 0;
}
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/Value.java Wed Mar 30 14:58:15 2011
@@ -93,7 +93,7 @@ public interface Value<T> extends Clonea
*
* @return a copy of the wrapped value
*/
- T get();
+ T getValue();
/**
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java Wed Mar 30 14:58:15 2011
@@ -316,7 +316,7 @@ public class CompareRequestImpl extends
if ( attrVal.isHR() )
{
- sb.append( attrVal.get() );
+ sb.append( attrVal.getValue() );
}
else
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java Wed Mar 30 14:58:15 2011
@@ -774,7 +774,7 @@ public class Ava implements Externalizab
if ( equalityMatchingRule != null )
{
- return equalityMatchingRule.getLdapComparator().compare( normValue.get(), instance.normValue.get() ) == 0;
+ return equalityMatchingRule.getLdapComparator().compare( normValue.getValue(), instance.normValue.getValue() ) == 0;
}
return false;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java Wed Mar 30 14:58:15 2011
@@ -634,7 +634,7 @@ public class Rdn implements Cloneable, E
case 1:
if ( Strings.equals( ava.getNormType(), normalizedType ) )
{
- return ava.getNormValue().get();
+ return ava.getNormValue().getValue();
}
return "";
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java Wed Mar 30 14:58:15 2011
@@ -85,7 +85,7 @@ public class CsnComparator extends LdapC
if ( csnObj1 instanceof StringValue )
{
- csnStr1 = ( ( StringValue ) csnObj1 ).get();
+ csnStr1 = ( ( StringValue ) csnObj1 ).getValue();
}
else
{
@@ -94,7 +94,7 @@ public class CsnComparator extends LdapC
if ( csnObj2 instanceof StringValue )
{
- csnStr2 = ( (StringValue) csnObj2 ).get();
+ csnStr2 = ( (StringValue) csnObj2 ).getValue();
}
else
{
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java Wed Mar 30 14:58:15 2011
@@ -259,7 +259,7 @@ public class BinaryValueAttributeTypeTes
bv = new BinaryValue( val );
assertTrue( Arrays.equals( val, bv.getReference() ) );
assertFalse( bv.isNull() );
- assertTrue( Arrays.equals( val, bv.get() ) );
+ assertTrue( Arrays.equals( val, bv.getValue() ) );
}
@@ -274,7 +274,7 @@ public class BinaryValueAttributeTypeTes
assertTrue( Arrays.equals( val, value.getReference() ) );
assertFalse( value.isNull() );
- assertTrue( Arrays.equals( val, value.get() ) );
+ assertTrue( Arrays.equals( val, value.getValue() ) );
}
@@ -587,7 +587,7 @@ public class BinaryValueAttributeTypeTes
byte[] normalized = sbv.getNormReference();
assertEquals( null, normalized );
- assertEquals( null, sbv.get() );
+ assertEquals( null, sbv.getValue() );
BinaryValue sbvSer = deserializeValue( serializeValue( sbv ), at );
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java Wed Mar 30 14:58:15 2011
@@ -250,7 +250,7 @@ public class BinaryValueTest
{
BinaryValue cbv = new BinaryValue( (byte[])null );
- assertNull( cbv.get() );
+ assertNull( cbv.getValue() );
assertFalse( cbv.isSchemaAware() );
assertTrue( cbv.isValid( BINARY_CHECKER ) );
assertTrue( cbv.isNull() );
@@ -264,7 +264,7 @@ public class BinaryValueTest
BinaryValue cbv = new BinaryValue( StringConstants.EMPTY_BYTES );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getBytes() ) );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.get() ) );
+ assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getValue() ) );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getReference() ) );
assertFalse( cbv.isSchemaAware() );
assertTrue( cbv.isValid( BINARY_CHECKER ) );
@@ -281,7 +281,7 @@ public class BinaryValueTest
BinaryValue cbv = new BinaryValue( BYTES1 );
assertTrue( Arrays.equals( BYTES1, cbv.getBytes() ) );
- assertTrue( Arrays.equals( BYTES1, cbv.get() ) );
+ assertTrue( Arrays.equals( BYTES1, cbv.getValue() ) );
assertTrue( Arrays.equals( BYTES1, cbv.getReference() ) );
assertFalse( cbv.isSchemaAware() );
assertTrue( cbv.isValid( BINARY_CHECKER ) );
@@ -299,7 +299,7 @@ public class BinaryValueTest
bv = new BinaryValue( BYTES1 );
assertTrue( Arrays.equals( BYTES1, bv.getBytes() ) );
- assertTrue( Arrays.equals( BYTES1, bv.get() ) );
+ assertTrue( Arrays.equals( BYTES1, bv.getValue() ) );
assertTrue( Arrays.equals( BYTES1, bv.getReference() ) );
assertFalse( bv.isSchemaAware() );
assertTrue( bv.isValid( BINARY_CHECKER ) );
@@ -315,7 +315,7 @@ public class BinaryValueTest
BinaryValue cbv = new BinaryValue( BYTES2 );
assertTrue( Arrays.equals( BYTES2, cbv.getBytes() ) );
- assertTrue( Arrays.equals( BYTES2, cbv.get() ) );
+ assertTrue( Arrays.equals( BYTES2, cbv.getValue() ) );
assertTrue( Arrays.equals( BYTES2, cbv.getReference() ) );
assertFalse( cbv.isSchemaAware() );
assertTrue( cbv.isValid( BINARY_CHECKER ) );
@@ -430,14 +430,14 @@ public class BinaryValueTest
{
BinaryValue bv = new BinaryValue( (byte[])null );
- assertNull( bv.get() );
+ assertNull( bv.getValue() );
bv = new BinaryValue( StringConstants.EMPTY_BYTES );
- assertNotNull( bv.get() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.get() ) );
+ assertNotNull( bv.getValue() );
+ assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getValue() ) );
bv = new BinaryValue( BYTES1 );
- byte[] copy = bv.get();
+ byte[] copy = bv.getValue();
assertTrue( Arrays.equals( BYTES1, copy ) );
@@ -520,10 +520,10 @@ public class BinaryValueTest
{
BinaryValue bv = new BinaryValue( (byte[])null );
- assertNull( bv.get() );
+ assertNull( bv.getValue() );
bv = new BinaryValue( StringConstants.EMPTY_BYTES );
- assertNotNull( bv.get() );
+ assertNotNull( bv.getValue() );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
bv = new BinaryValue( BYTES1 );
@@ -649,7 +649,7 @@ public class BinaryValueTest
bv = new BinaryValue( BYTES2 );
bv.apply( at );
assertTrue( bv.isSchemaAware() );
- assertTrue( Arrays.equals( BYTES2, bv.get() ) );
+ assertTrue( Arrays.equals( BYTES2, bv.getValue() ) );
assertTrue( Arrays.equals( BYTES1, bv.getNormValue() ) );
}
@@ -659,20 +659,20 @@ public class BinaryValueTest
{
BinaryValue bv = new BinaryValue( (byte[])null );
- assertNull( bv.get() );
+ assertNull( bv.getValue() );
assertFalse( bv.isSchemaAware() );
assertTrue( bv.isValid( BINARY_CHECKER ) );
assertTrue( bv.isNull() );
bv = new BinaryValue( StringConstants.EMPTY_BYTES );
- assertNotNull( bv.get() );
+ assertNotNull( bv.getValue() );
assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
assertFalse( bv.isSchemaAware() );
assertTrue( bv.isValid( BINARY_CHECKER ) );
assertFalse( bv.isNull() );
bv = new BinaryValue( BYTES1 );
- assertNotNull( bv.get() );
+ assertNotNull( bv.getValue() );
assertTrue( Arrays.equals( BYTES1, bv.getBytes() ) );
assertFalse( bv.isSchemaAware() );
assertTrue( bv.isValid( BINARY_CHECKER ) );
@@ -717,7 +717,7 @@ public class BinaryValueTest
assertTrue( Arrays.equals( BYTES1, bv.getNormValue() ) );
assertTrue( bv.isSchemaAware() );
- assertTrue( Arrays.equals( BYTES2, bv.get() ) );
+ assertTrue( Arrays.equals( BYTES2, bv.getValue() ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1086976&r1=1086975&r2=1086976&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java Wed Mar 30 14:58:15 2011
@@ -183,7 +183,7 @@ public class StringValueAttributeTypeTes
StringValue value = new StringValue( attribute, null );
- assertNull( value.get() );
+ assertNull( value.getValue() );
assertTrue( value.isNull() );
}
@@ -485,7 +485,7 @@ public class StringValueAttributeTypeTes
// check that normalization and syntax checks work as expected
StringValue value = new StringValue( at, "HIGH" );
- assertEquals( value.get(), value.get() );
+ assertEquals( value.getValue(), value.getValue() );
try
{
@@ -556,7 +556,7 @@ public class StringValueAttributeTypeTes
{
// check that normalization and syntax checks work as expected
StringValue value = new StringValue( at, "hello" );
- assertEquals( value.get(), value.get() );
+ assertEquals( value.getValue(), value.getValue() );
// create a bunch to best tested for equals and in containers
StringValue v0 = new StringValue( at, "hello" );
@@ -695,7 +695,7 @@ public class StringValueAttributeTypeTes
String normalized = ssv.getNormValue();
assertNull( normalized );
- assertNull( ssv.get() );
+ assertNull( ssv.getValue() );
StringValue ssvSer = deserializeValue( serializeValue( ssv ) );