From commits-return-30563-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Feb 06 04:58:51 2011 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 59897 invoked from network); 6 Feb 2011 04:58:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Feb 2011 04:58:51 -0000 Received: (qmail 36368 invoked by uid 500); 6 Feb 2011 04:58:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 36320 invoked by uid 500); 6 Feb 2011 04:58:50 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 36313 invoked by uid 99); 6 Feb 2011 04:58:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Feb 2011 04:58:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Feb 2011 04:58:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4EA6D2388A2C; Sun, 6 Feb 2011 04:58:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1067584 - in /directory/shared/branches/m1/dsml-parser/src: main/java/org/apache/directory/shared/dsmlv2/ main/java/org/apache/directory/shared/dsmlv2/reponse/ test/java/org/apache/directory/shared/dsmlv2/batchResponse/ test/java/org/apach... Date: Sun, 06 Feb 2011 04:58:20 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110206045820.4EA6D2388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Feb 6 04:58:19 2011 New Revision: 1067584 URL: http://svn.apache.org/viewvc?rev=1067584&view=rev Log: removed BatchResponse, just using BatchResponseDsml, seems BatchResponse is very redundant Removed: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponse.java Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java (original) +++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java Sun Feb 6 04:58:19 2011 @@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml import org.apache.directory.shared.asn1.ber.Asn1Container; -import org.apache.directory.shared.dsmlv2.reponse.BatchResponse; +import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml; import org.apache.directory.shared.dsmlv2.request.BatchRequest; import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.xmlpull.v1.XmlPullParser; @@ -52,7 +52,7 @@ public class Dsmlv2Container implements private BatchRequest batchRequest; /** The BatchResponse of the parsing */ - private BatchResponse batchResponse; + private BatchResponseDsml batchResponse; /** The associated grammar */ private AbstractGrammar grammar; @@ -111,7 +111,7 @@ public class Dsmlv2Container implements * @return * Returns the Batch Response */ - public BatchResponse getBatchResponse() + public BatchResponseDsml getBatchResponse() { return batchResponse; } @@ -123,7 +123,7 @@ public class Dsmlv2Container implements * @param batchResponse * the Batch Response to set */ - public void setBatchResponse( BatchResponse batchResponse ) + public void setBatchResponse( BatchResponseDsml batchResponse ) { this.batchResponse = batchResponse; } Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (original) +++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java Sun Feb 6 04:58:19 2011 @@ -28,7 +28,7 @@ import java.io.InputStream; import java.io.Reader; import java.io.StringReader; -import org.apache.directory.shared.dsmlv2.reponse.BatchResponse; +import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml; import org.apache.directory.shared.dsmlv2.reponse.Dsmlv2ResponseGrammar; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.codec.LdapCodecService; @@ -215,7 +215,7 @@ public class Dsmlv2ResponseParser * @return * the Batch Response or null if the it has not been parsed yet */ - public BatchResponse getBatchResponse() + public BatchResponseDsml getBatchResponse() { return container.getBatchResponse(); } @@ -228,7 +228,7 @@ public class Dsmlv2ResponseParser * @throws XmlPullParserException * when an error occurs during the parsing */ - public Response getNextResponse() throws XmlPullParserException + public DsmlDecorator getNextResponse() throws XmlPullParserException { if ( container.getBatchResponse() == null ) { Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original) +++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Sun Feb 6 04:58:19 2011 @@ -30,6 +30,7 @@ import java.util.Set; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.util.OID; import org.apache.directory.shared.dsmlv2.AbstractGrammar; +import org.apache.directory.shared.dsmlv2.DsmlDecorator; import org.apache.directory.shared.dsmlv2.Dsmlv2Container; import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum; import org.apache.directory.shared.dsmlv2.GrammarAction; @@ -770,7 +771,7 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - BatchResponse batchResponse = new BatchResponse(); + BatchResponseDsml batchResponse = new BatchResponseDsml(); container.setBatchResponse( batchResponse ); @@ -796,8 +797,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { AddResponseDecorator addResponse = new AddResponseDecorator( container.getLdapCodecService(), new AddResponseImpl() ); - - container.getBatchResponse().addResponse( addResponse ); + AddResponseDsml addResponseDsml = new AddResponseDsml( container.getLdapCodecService(), addResponse ); + container.getBatchResponse().addResponse( addResponseDsml ); LdapResult ldapResult = addResponse.getLdapResult(); @@ -838,8 +839,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { BindResponseDecorator bindResponse = new BindResponseDecorator( container.getLdapCodecService(), new BindResponseImpl() ); - - container.getBatchResponse().addResponse( bindResponse ); + BindResponseDsml bindResponseDsml = new BindResponseDsml( container.getLdapCodecService(), bindResponse ); + container.getBatchResponse().addResponse( bindResponseDsml ); LdapResult ldapResult = bindResponse.getLdapResult(); @@ -881,8 +882,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { CompareResponseDecorator compareResponse = new CompareResponseDecorator( container.getLdapCodecService(), new CompareResponseImpl() ); - - container.getBatchResponse().addResponse( compareResponse ); + CompareResponseDsml compareResponseDsml = new CompareResponseDsml( container.getLdapCodecService(), compareResponse ); + container.getBatchResponse().addResponse( compareResponseDsml ); LdapResult ldapResult = compareResponse.getLdapResult(); @@ -923,8 +924,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { DeleteResponseDecorator delResponse = new DeleteResponseDecorator( container.getLdapCodecService(), new DeleteResponseImpl() ); - - container.getBatchResponse().addResponse( delResponse ); + DelResponseDsml delResponseDsml = new DelResponseDsml( container.getLdapCodecService(), delResponse ); + container.getBatchResponse().addResponse( delResponseDsml ); LdapResult ldapResult = delResponse.getLdapResult(); @@ -965,8 +966,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { ModifyResponseDecorator modifyResponse = new ModifyResponseDecorator( container.getLdapCodecService(), new ModifyResponseImpl() ); - - container.getBatchResponse().addResponse( modifyResponse ); + ModifyResponseDsml modifyResponseDsml = new ModifyResponseDsml( container.getLdapCodecService(), modifyResponse ); + container.getBatchResponse().addResponse( modifyResponseDsml ); LdapResult ldapResult = modifyResponse.getLdapResult(); @@ -1007,8 +1008,8 @@ public final class Dsmlv2ResponseGrammar public void action( Dsmlv2Container container ) throws XmlPullParserException { ModifyDnResponseDecorator modifyDNResponse = new ModifyDnResponseDecorator( container.getLdapCodecService(), new ModifyDnResponseImpl() ); - - container.getBatchResponse().addResponse( modifyDNResponse ); + ModDNResponseDsml modDNResponseDsml = new ModDNResponseDsml( container.getLdapCodecService(), modifyDNResponse ); + container.getBatchResponse().addResponse( modDNResponseDsml ); LdapResult ldapResult = modifyDNResponse.getLdapResult(); @@ -1067,7 +1068,8 @@ public final class Dsmlv2ResponseGrammar extendedResponse = new ExtendedResponseDecorator( container.getLdapCodecService(), new ExtendedResponseImpl( -1 ) ); } - container.getBatchResponse().addResponse( extendedResponse ); + ExtendedResponseDsml extendedResponseDsml = new ExtendedResponseDsml( container.getLdapCodecService(), extendedResponse ); + container.getBatchResponse().addResponse( extendedResponseDsml ); LdapResult ldapResult = extendedResponse.getLdapResult(); @@ -1247,15 +1249,19 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Response ldapResponse = container.getBatchResponse().getCurrentResponse(); + DsmlDecorator ldapResponse = + container.getBatchResponse().getCurrentResponse(); // Search Response is a special case - if ( ldapResponse instanceof SearchResponse ) + if ( ldapResponse.getDecorated() instanceof SearchResponse ) { - ldapResponse = ( ( SearchResponse ) ldapResponse ).getSearchResultDone(); + createAndAddControl( container, ( ( SearchResponse ) + ldapResponse.getDecorated() ).getSearchResultDone() ); + } + else + { + createAndAddControl( container, ldapResponse.getDecorated() ); } - - createAndAddControl( container, ldapResponse ); } }; @@ -1267,7 +1273,7 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse() ) + Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); createAndAddControl( container, ldapMessage ); } @@ -1281,7 +1287,7 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse() ) + Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultReference(); createAndAddControl( container, ldapMessage ); } @@ -1333,14 +1339,20 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Response ldapResponse = container.getBatchResponse().getCurrentResponse(); + + DsmlDecorator ldapResponse = + container.getBatchResponse().getCurrentResponse(); + // Search Response is a special case - if ( ldapResponse instanceof SearchResponse ) + if ( ldapResponse.getDecorated() instanceof SearchResponse ) { - ldapResponse = ( ( SearchResponse ) ldapResponse ).getSearchResultDone(); + createAndAddControlValue( container, ( ( SearchResponse ) + ldapResponse.getDecorated() ).getSearchResultDone() ); + } + else + { + createAndAddControlValue( container, ldapResponse.getDecorated() ); } - - createAndAddControlValue( container, ldapResponse ); } }; @@ -1352,7 +1364,7 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse() ) + Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); createAndAddControlValue( container, ldapMessage ); } @@ -1366,7 +1378,7 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse() ) + Message ldapMessage = ( ( SearchResponse ) container.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultReference(); createAndAddControlValue( container, ldapMessage ); } @@ -1379,20 +1391,21 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Response ldapResponse = container.getBatchResponse().getCurrentResponse(); + DsmlDecorator ldapResponse = + container.getBatchResponse().getCurrentResponse(); LdapResult ldapResult = null; // Search Response is a special case // ResultCode can only occur in a case of Search Result Done in a Search Response - if ( ldapResponse instanceof SearchResponse ) + if ( ldapResponse.getDecorated() instanceof SearchResponse ) { - SearchResponse searchResponse = ( SearchResponse ) ldapResponse; + SearchResponse searchResponse = ( SearchResponse ) ldapResponse.getDecorated(); ldapResult = searchResponse.getSearchResultDone().getLdapResult(); } else { - ldapResult = ( ( ResultResponse ) ldapResponse ).getLdapResult(); + ldapResult = ( ( ResultResponse ) ldapResponse.getDecorated() ).getLdapResult(); } XmlPullParser xpp = container.getParser(); @@ -1435,20 +1448,21 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Response ldapResponse = container.getBatchResponse().getCurrentResponse(); + DsmlDecorator ldapResponse = + container.getBatchResponse().getCurrentResponse(); LdapResult ldapResult = null; // Search Response is a special case // ResultCode can only occur in a case of Search Result Done in a Search Response - if ( ldapResponse instanceof SearchResponse ) + if ( ldapResponse.getDecorated() instanceof SearchResponse ) { - SearchResponse searchResponse = ( SearchResponse ) ldapResponse; + SearchResponse searchResponse = ( SearchResponse ) ldapResponse.getDecorated(); ldapResult = searchResponse.getSearchResultDone().getLdapResult(); } else { - ldapResult = ( ( ResultResponse ) ldapResponse ).getLdapResult(); + ldapResult = ( ( ResultResponse ) ldapResponse.getDecorated() ).getLdapResult(); } XmlPullParser xpp = container.getParser(); @@ -1476,20 +1490,21 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - Response ldapResponse = container.getBatchResponse().getCurrentResponse(); + DsmlDecorator ldapResponse = + container.getBatchResponse().getCurrentResponse(); LdapResult ldapResult = null; // Search Response is a special case // ResultCode can only occur in a case of Search Result Done in a Search Response - if ( ldapResponse instanceof SearchResponse ) + if ( ldapResponse.getDecorated() instanceof SearchResponse ) { - SearchResponse searchResponse = ( SearchResponse ) ldapResponse; + SearchResponse searchResponse = ( SearchResponse ) ldapResponse.getDecorated(); ldapResult = searchResponse.getSearchResultDone().getLdapResult(); } else { - ldapResult = ( ( ResultResponse ) ldapResponse ).getLdapResult(); + ldapResult = ( ( ResultResponse ) ldapResponse.getDecorated() ).getLdapResult(); } // Initialization of the Referrals if needed @@ -1540,14 +1555,16 @@ public final class Dsmlv2ResponseGrammar if ( attributeValue != null ) { - searchResponse = new SearchResponse( ParserUtils.parseAndVerifyRequestID( attributeValue, xpp ), null ); + searchResponse = new SearchResponse( + ParserUtils.parseAndVerifyRequestID( attributeValue, xpp ), null ); } else { searchResponse = new SearchResponse( -1, null ); } - container.getBatchResponse().addResponse( searchResponse ); + container.getBatchResponse().addResponse( new SearchResponseDsml( + container.getLdapCodecService(), searchResponse ) ); } }; @@ -1559,9 +1576,13 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResultEntryDecorator searchResultEntry = new SearchResultEntryDecorator( container.getLdapCodecService(), new SearchResultEntryImpl() ); + SearchResultEntryDecorator searchResultEntry = + new SearchResultEntryDecorator( + container.getLdapCodecService(), + new SearchResultEntryImpl() ); - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + container.getBatchResponse().getCurrentResponse().getDecorated(); searchResponse.addSearchResultEntry( searchResultEntry ); @@ -1606,9 +1627,13 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResultReferenceDecorator searchResultReference = new SearchResultReferenceDecorator( container.getLdapCodecService(), new SearchResultReferenceImpl() ); + SearchResultReferenceDecorator searchResultReference = + new SearchResultReferenceDecorator( + container.getLdapCodecService(), + new SearchResultReferenceImpl() ); - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + container.getBatchResponse().getCurrentResponse().getDecorated(); searchResponse.addSearchResultReference( searchResultReference ); @@ -1634,11 +1659,14 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResultDoneDecorator searchResultDone = new SearchResultDoneDecorator( container.getLdapCodecService(), new SearchResultDoneImpl() ); + SearchResultDoneDecorator searchResultDone = + new SearchResultDoneDecorator( container.getLdapCodecService(), + new SearchResultDoneImpl() ); searchResultDone.getLdapResult(); - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) container + .getBatchResponse().getCurrentResponse().getDecorated(); searchResponse.setSearchResultDone( searchResultDone ); @@ -1678,9 +1706,12 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + container.getBatchResponse().getCurrentResponse().getDecorated(); - SearchResultEntryDecorator searchResultEntry = (SearchResultEntryDecorator)searchResponse.getCurrentSearchResultEntry(); + SearchResultEntryDecorator searchResultEntry = + ( SearchResultEntryDecorator ) + searchResponse.getCurrentSearchResultEntry(); XmlPullParser xpp = container.getParser(); @@ -1715,8 +1746,10 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); - SearchResultEntryDecorator searchResultEntry = (SearchResultEntryDecorator)searchResponse.getCurrentSearchResultEntry(); + SearchResponse searchResponse = ( SearchResponse ) + container.getBatchResponse().getCurrentResponse().getDecorated(); + SearchResultEntryDecorator searchResultEntry = ( SearchResultEntryDecorator ) + searchResponse.getCurrentSearchResultEntry(); XmlPullParser xpp = container.getParser(); @@ -1752,7 +1785,8 @@ public final class Dsmlv2ResponseGrammar { public void action( Dsmlv2Container container ) throws XmlPullParserException { - SearchResponse searchResponse = ( SearchResponse ) container.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + container.getBatchResponse().getCurrentResponse().getDecorated(); SearchResultReference searchResultReference = searchResponse.getCurrentSearchResultReference(); XmlPullParser xpp = container.getParser(); Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java (original) +++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java Sun Feb 6 04:58:19 2011 @@ -27,7 +27,6 @@ import org.apache.directory.shared.dsmlv import org.apache.directory.shared.ldap.codec.LdapCodecService; import org.apache.directory.shared.ldap.model.message.Message; import org.apache.directory.shared.ldap.model.message.Response; -import org.apache.directory.shared.ldap.model.message.ResultResponse; import org.dom4j.Element; @@ -38,7 +37,7 @@ import org.dom4j.Element; * * @author Apache Directory Project */ -public class SearchResponseDsml extends AbstractResultResponseDsml +public class SearchResponseDsml extends AbstractResponseDsml { /** The responses */ private List> responses = @@ -61,7 +60,7 @@ public class SearchResponseDsml extends */ public SearchResponseDsml( LdapCodecService codec, Message response ) { - super( codec, ( ResultResponse ) response ); + super( codec, ( Response ) response ); } Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java (original) +++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java Sun Feb 6 04:58:19 2011 @@ -28,8 +28,9 @@ import static org.junit.Assert.fail; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.dsmlv2.AbstractResponseTest; +import org.apache.directory.shared.dsmlv2.DsmlDecorator; import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser; -import org.apache.directory.shared.dsmlv2.reponse.BatchResponse; +import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml; import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse; import org.apache.directory.shared.dsmlv2.reponse.SearchResponse; import org.apache.directory.shared.ldap.model.message.AddResponse; @@ -74,7 +75,7 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1234567890, batchResponse.getRequestID() ); } @@ -111,7 +112,7 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 0, batchResponse.getResponses().size() ); } @@ -138,11 +139,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof AddResponse) { @@ -176,11 +177,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof BindResponse ) { @@ -214,11 +215,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof CompareResponse ) { @@ -252,11 +253,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof DeleteResponse ) { @@ -290,11 +291,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ErrorResponse ) { @@ -328,11 +329,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ExtendedResponse ) { @@ -366,11 +367,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ModifyDnResponse ) { @@ -404,11 +405,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ModifyResponse ) { @@ -442,13 +443,13 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 1, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); - if ( response instanceof SearchResponse ) + if ( response.getDecorated() instanceof SearchResponse ) { assertTrue( true ); } @@ -480,11 +481,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof AddResponse ) { @@ -518,11 +519,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof BindResponse ) { @@ -556,11 +557,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof CompareResponse ) { @@ -594,11 +595,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof DeleteResponse ) { @@ -632,11 +633,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ErrorResponse ) { @@ -670,11 +671,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ExtendedResponse) { @@ -708,11 +709,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ModifyDnResponse ) { @@ -746,11 +747,11 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); if ( response instanceof ModifyResponse ) { @@ -784,13 +785,13 @@ public class BatchResponseTest extends A fail( e.getMessage() ); } - BatchResponse batchResponse = parser.getBatchResponse(); + BatchResponseDsml batchResponse = parser.getBatchResponse(); assertEquals( 2, batchResponse.getResponses().size() ); - Response response = batchResponse.getCurrentResponse(); + DsmlDecorator response = batchResponse.getCurrentResponse(); - if ( response instanceof SearchResponse ) + if ( response.getDecorated() instanceof SearchResponse ) { assertTrue( true ); } Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (original) +++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java Sun Feb 6 04:58:19 2011 @@ -63,7 +63,7 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 456, searchResponse.getMessageId() ); } @@ -99,7 +99,7 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated(); assertNotNull( searchResponse.getSearchResultDone() ); } @@ -126,7 +126,7 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 1, searchResponse.getSearchResultEntryList().size() ); @@ -155,7 +155,8 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 1, searchResponse.getSearchResultReferenceList().size() ); @@ -184,7 +185,8 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 1, searchResponse.getSearchResultEntryList().size() ); @@ -215,7 +217,8 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 2, searchResponse.getSearchResultEntryList().size() ); @@ -244,7 +247,8 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 2, searchResponse.getSearchResultReferenceList().size() ); @@ -273,7 +277,7 @@ public class SearchResponseTest extends fail( e.getMessage() ); } - SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse(); + SearchResponse searchResponse = ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated(); assertEquals( 2, searchResponse.getSearchResultEntryList().size() ); Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original) +++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Sun Feb 6 04:58:19 2011 @@ -78,7 +78,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); Map controls = searchResultDone.getControls(); @@ -114,7 +114,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); Map controls = searchResultDone.getControls(); @@ -150,7 +150,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); Map controls = searchResultDone.getControls(); @@ -186,7 +186,8 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); Map controls = searchResultDone.getControls(); @@ -222,7 +223,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); assertEquals( 456, searchResultDone.getMessageId() ); @@ -280,7 +281,8 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -310,7 +312,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -341,7 +343,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -371,7 +373,8 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -412,7 +415,8 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) + parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -444,7 +448,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -494,7 +498,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); @@ -535,7 +539,7 @@ public class SearchResultDoneTest extend fail( e.getMessage() ); } - SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getSearchResultDone(); LdapResult ldapResult = searchResultDone.getLdapResult(); Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original) +++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Sun Feb 6 04:58:19 2011 @@ -77,7 +77,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Map controls = searchResultEntry.getControls(); @@ -113,7 +113,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Map controls = searchResultEntry.getControls(); @@ -149,7 +149,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Map controls = searchResultEntry.getControls(); @@ -185,7 +185,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Map controls = searchResultEntry.getControls(); @@ -241,7 +241,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); assertEquals( "dc=example,dc=com", searchResultEntry.getObjectName().toString() ); @@ -269,7 +269,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); assertEquals( 456, searchResultEntry.getMessageId() ); @@ -332,7 +332,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); @@ -365,7 +365,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); @@ -404,7 +404,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); @@ -447,7 +447,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); @@ -486,7 +486,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); @@ -529,7 +529,7 @@ public class SearchResultEntryTest exten fail( e.getMessage() ); } - SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() ) + SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse().getDecorated() ) .getCurrentSearchResultEntry(); Entry entry = searchResultEntry.getEntry(); Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1067584&r1=1067583&r2=1067584&view=diff ============================================================================== --- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original) +++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Sun Feb 6 04:58:19 2011 @@ -76,7 +76,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Map controls = searchResultReference.getControls(); assertEquals( 1, searchResultReference.getControls().size() ); @@ -112,7 +112,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Map controls = searchResultReference.getControls(); assertEquals( 1, searchResultReference.getControls().size() ); @@ -148,7 +148,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Map controls = searchResultReference.getControls(); assertEquals( 2, searchResultReference.getControls().size() ); @@ -183,7 +183,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Map controls = searchResultReference.getControls(); assertEquals( 3, searchResultReference.getControls().size() ); @@ -219,7 +219,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); assertEquals( 456, searchResultReference.getMessageId() ); } @@ -267,7 +267,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Collection references = searchResultReference.getReferral().getLdapUrls(); @@ -306,7 +306,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Collection references = searchResultReference.getReferral().getLdapUrls(); @@ -336,7 +336,7 @@ public class SearchResultReferenceTest e } SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse() - .getCurrentResponse() ).getCurrentSearchResultReference(); + .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference(); Collection references = searchResultReference.getReferral().getLdapUrls();