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 2014/03/25 21:56:11 UTC
svn commit: r1581512 - in /directory/shared/trunk/ldap/codec/core/src:
main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java
test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java
Author: elecharny
Date: Tue Mar 25 20:56:10 2014
New Revision: 1581512
URL: http://svn.apache.org/r1581512
Log:
o The LdapResult is now injected into the newly created extended operation when we create it (as we know which kind of extOp we are dealing with).
Modified:
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java
directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java?rev=1581512&r1=1581511&r2=1581512&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/actions/extendedResponse/StoreExtendedResponseName.java Tue Mar 25 20:56:10 2014
@@ -28,6 +28,7 @@ import org.apache.directory.api.i18n.I18
import org.apache.directory.api.ldap.codec.api.ExtendedResponseDecorator;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
+import org.apache.directory.api.ldap.codec.decorators.LdapResultDecorator;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
@@ -89,6 +90,8 @@ public class StoreExtendedResponseName e
extendedResponse = LdapApiServiceFactory.getSingleton().newExtendedResponse( responseName,
container.getMessageId(), null );
+
+ ((ExtendedResponseDecorator<?>)extendedResponse).setLdapResult( ((LdapResultDecorator)(container.getMessage().getLdapResult() ) ) );
container.setMessage( LdapApiServiceFactory.getSingleton().decorate( extendedResponse ) );
}
Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java?rev=1581512&r1=1581511&r2=1581512&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/api/ldap/codec/extended/ExtendedResponseTest.java Tue Mar 25 20:56:10 2014
@@ -21,7 +21,6 @@ package org.apache.directory.api.ldap.co
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -38,6 +37,7 @@ import org.apache.directory.api.ldap.cod
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.ExtendedResponse;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -133,8 +133,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "value", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
@@ -268,8 +268,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "value", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
@@ -718,8 +718,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
@@ -844,8 +844,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
@@ -953,8 +953,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "", Strings.utf8ToString( extendedResponse.getResponseValue() ) );
@@ -1082,8 +1082,8 @@ public class ExtendedResponseTest extend
assertEquals( 1, extendedResponse.getMessageId() );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
- assertNull( extendedResponse.getLdapResult().getMatchedDn() );
- assertNull( extendedResponse.getLdapResult().getDiagnosticMessage() );
+ assertEquals( Dn.EMPTY_DN, extendedResponse.getLdapResult().getMatchedDn() );
+ assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() );
assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
assertEquals( "", Strings.utf8ToString( extendedResponse.getResponseValue() ) );