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 2010/03/25 16:02:38 UTC
svn commit: r927435 - in /directory/shared/trunk/ldap/src:
main/java/org/apache/directory/shared/ldap/entry/client/
test/java/org/apache/directory/shared/ldap/entry/client/
Author: elecharny
Date: Thu Mar 25 15:02:38 2010
New Revision: 927435
URL: http://svn.apache.org/viewvc?rev=927435&view=rev
Log:
Removed the useless ClientEntry interface
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntry.java
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntryFactory.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntryFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntryFactory.java?rev=927435&r1=927434&r2=927435&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntryFactory.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientEntryFactory.java Thu Mar 25 15:02:38 2010
@@ -18,6 +18,8 @@
*/
package org.apache.directory.shared.ldap.entry.client;
+import org.apache.directory.shared.ldap.entry.Entry;
+
/**
* Document me!
@@ -27,5 +29,5 @@ package org.apache.directory.shared.ldap
*/
public interface ClientEntryFactory
{
- ClientEntry newEntry();
+ Entry newEntry();
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=927435&r1=927434&r2=927435&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java Thu Mar 25 15:02:38 2010
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public final class DefaultClientEntry extends AbstractEntry<String> implements ClientEntry
+public final class DefaultClientEntry extends AbstractEntry<String> //implements ClientEntry
{
/** Used for serialization */
private static final long serialVersionUID = 2L;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java?rev=927435&r1=927434&r2=927435&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java Thu Mar 25 15:02:38 2010
@@ -95,7 +95,7 @@ public class DefaultClientEntryTest
/**
* Serialize a ClientEntry
*/
- private ByteArrayOutputStream serializeValue( ClientEntry value ) throws IOException
+ private ByteArrayOutputStream serializeValue( Entry value ) throws IOException
{
ObjectOutputStream oOut = null;
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -132,7 +132,7 @@ public class DefaultClientEntryTest
/**
* Deserialize a ClientEntry
*/
- private ClientEntry deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
+ private Entry deserializeValue( ByteArrayOutputStream out ) throws IOException, ClassNotFoundException
{
ObjectInputStream oIn = null;
ByteArrayInputStream in = new ByteArrayInputStream( out.toByteArray() );
@@ -141,7 +141,7 @@ public class DefaultClientEntryTest
{
oIn = new ObjectInputStream( in );
- ClientEntry value = ( ClientEntry ) oIn.readObject();
+ Entry value = ( Entry ) oIn.readObject();
return value;
}
@@ -1271,12 +1271,12 @@ public class DefaultClientEntryTest
dn.normalize( oids );
byte[] password = StringTools.getBytesUtf8( "secret" );
- ClientEntry entry = new DefaultClientEntry( dn);
+ Entry entry = new DefaultClientEntry( dn);
entry.add( "ObjectClass", "top", "person" );
entry.add( "cn", "test1" );
entry.add( "userPassword", password );
- ClientEntry entrySer = deserializeValue( serializeValue( entry ) );
+ Entry entrySer = deserializeValue( serializeValue( entry ) );
assertEquals( entry, entrySer );
}
@@ -1289,12 +1289,12 @@ public class DefaultClientEntryTest
public void testSerializeEntryWithNoDN() throws LdapException, IOException, ClassNotFoundException
{
byte[] password = StringTools.getBytesUtf8( "secret" );
- ClientEntry entry = new DefaultClientEntry();
+ Entry entry = new DefaultClientEntry();
entry.add( "ObjectClass", "top", "person" );
entry.add( "cn", "test1" );
entry.add( "userPassword", password );
- ClientEntry entrySer = deserializeValue( serializeValue( entry ) );
+ Entry entrySer = deserializeValue( serializeValue( entry ) );
assertEquals( entry, entrySer );
}
@@ -1306,9 +1306,9 @@ public class DefaultClientEntryTest
@Test
public void testSerializeEntryWithNoDNNoAttribute() throws LdapException, IOException, ClassNotFoundException
{
- ClientEntry entry = new DefaultClientEntry();
+ Entry entry = new DefaultClientEntry();
- ClientEntry entrySer = deserializeValue( serializeValue( entry ) );
+ Entry entrySer = deserializeValue( serializeValue( entry ) );
assertEquals( entry, entrySer );
}
@@ -1324,12 +1324,12 @@ public class DefaultClientEntryTest
dn.normalize( oids );
- ClientEntry entry = new DefaultClientEntry( dn );
+ Entry entry = new DefaultClientEntry( dn );
- ClientEntry entrySer = deserializeValue( serializeValue( entry ) );
+ Entry entrySer = deserializeValue( serializeValue( entry ) );
assertEquals( entry, entrySer );
}
-
+
}