Skip to content
Permalink
Browse files
Renamed the LdapMessageContainerDirect to LdapMessageContainer
  • Loading branch information
elecharny committed Jan 1, 2019
1 parent c414542 commit ef9080f80c8df61b17f3d30abf105b1e5ed6e164
Show file tree
Hide file tree
Showing 127 changed files with 1,017 additions and 1,238 deletions.
@@ -61,7 +61,7 @@
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.codec.api.LdapDecoder;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.codec.api.MessageEncoderException;
import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector;
import org.apache.directory.api.ldap.extras.extended.startTls.StartTlsRequestImpl;
@@ -894,8 +894,8 @@ else if ( responseFuture instanceof SearchFuture )

// Store the container into the session if we don't have one
@SuppressWarnings("unchecked")
LdapMessageContainerDirect<? extends Message> container =
( LdapMessageContainerDirect<? extends Message> ) ldapSession
LdapMessageContainer<? extends Message> container =
( LdapMessageContainer<? extends Message> ) ldapSession
.getAttribute( LdapDecoder.MESSAGE_CONTAINER_ATTR );

if ( container != null )
@@ -915,7 +915,7 @@ else if ( responseFuture instanceof SearchFuture )
}

ldapSession.setAttribute( LdapDecoder.MESSAGE_CONTAINER_ATTR,
new LdapMessageContainerDirect<Message>( codec, atDetector ) );
new LdapMessageContainer<Message>( codec, atDetector ) );
}

// Initialize the MessageId
@@ -4333,7 +4333,7 @@ public void loadSchema( SchemaLoader loader ) throws LdapException

// Change the container's BinaryDetector
ldapSession.setAttribute( LdapDecoder.MESSAGE_CONTAINER_ATTR,
new LdapMessageContainerDirect<>( codec,
new LdapMessageContainer<>( codec,
new SchemaBinaryAttributeDetector( schemaManager ) ) );

}
@@ -4576,8 +4576,8 @@ public void inputClosed( IoSession session ) throws Exception
public void sessionCreated( IoSession session ) throws Exception
{
// Last, store the message container
LdapMessageContainerDirect<Message> ldapMessageContainer =
new LdapMessageContainerDirect<>(
LdapMessageContainer<Message> ldapMessageContainer =
new LdapMessageContainer<>(
codec, config.getBinaryAttributeDetector() );

session.setAttribute( LdapDecoder.MESSAGE_CONTAINER_ATTR, ldapMessageContainer );
@@ -126,7 +126,7 @@
import org.apache.directory.api.ldap.codec.actions.response.search.reference.InitSearchResultReference;
import org.apache.directory.api.ldap.codec.actions.response.search.reference.StoreReference;
import org.apache.directory.api.ldap.codec.api.LdapCodecConstants;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.AbstractMessage;
import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.slf4j.Logger;
@@ -141,13 +141,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class LdapMessageGrammar extends
AbstractGrammar<LdapMessageContainerDirect<AbstractMessage>>
AbstractGrammar<LdapMessageContainer<AbstractMessage>>
{
/** The logger */
static final Logger LOG = LoggerFactory.getLogger( LdapMessageGrammar.class );

/** The instance of grammar. LdapMessageGrammar is a singleton */
private static Grammar<LdapMessageContainerDirect<AbstractMessage>> instance =
private static Grammar<LdapMessageContainer<AbstractMessage>> instance =
new LdapMessageGrammar();


@@ -3777,7 +3777,7 @@ private LdapMessageGrammar()
LdapStatesEnum.TYPE_SUBSTRING_STATE,
LdapStatesEnum.SUBSTRINGS_STATE,
SEQUENCE,
new CheckNotNullLength<LdapMessageContainerDirect<SearchRequest>>() );
new CheckNotNullLength<LdapMessageContainer<SearchRequest>>() );

// --------------------------------------------------------------------------------------------
// Transition from substrings to Initial
@@ -21,7 +21,7 @@


import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Message;


@@ -30,7 +30,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AllowGrammarEnd extends GrammarAction<LdapMessageContainerDirect<Message>>
public class AllowGrammarEnd extends GrammarAction<LdapMessageContainer<Message>>
{
/**
* Instantiates a new value action.
@@ -44,7 +44,7 @@ public AllowGrammarEnd()
/**
* {@inheritDoc}
*/
public void action( LdapMessageContainerDirect<Message> container )
public void action( LdapMessageContainer<Message> container )
{
container.setGrammarEndAllowed( true );
}
@@ -24,7 +24,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CheckLengthNotNull extends GrammarAction<LdapMessageContainerDirect<Message>>
public class CheckLengthNotNull extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( CheckLengthNotNull.class );
@@ -53,7 +53,7 @@ public CheckLengthNotNull()
/**
* {@inheritDoc}
*/
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();
int expectedLength = tlv.getLength();
@@ -23,7 +23,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class InitControls extends GrammarAction<LdapMessageContainerDirect<Message>>
public class InitControls extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( InitControls.class );
@@ -58,7 +58,7 @@ public InitControls()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container )
public void action( LdapMessageContainer<Message> container )
{
TLV tlv = container.getCurrentTLV();
int expectedLength = tlv.getLength();
@@ -27,7 +27,7 @@
import org.apache.directory.api.asn1.ber.tlv.BooleanDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.util.Strings;
@@ -46,7 +46,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreControlCriticality extends GrammarAction<LdapMessageContainerDirect<Message>>
public class StoreControlCriticality extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreControlCriticality.class );
@@ -64,7 +64,7 @@ public StoreControlCriticality()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -27,7 +27,7 @@
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.ldap.model.message.Request;
@@ -47,7 +47,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreControlName extends GrammarAction<LdapMessageContainerDirect<Message>>
public class StoreControlName extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreControlName.class );
@@ -65,7 +65,7 @@ public StoreControlName()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -26,7 +26,7 @@
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.ControlFactory;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.util.Strings;
@@ -46,7 +46,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreControlValue extends GrammarAction<LdapMessageContainerDirect<Message>>
public class StoreControlValue extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreControlValue.class );
@@ -65,7 +65,7 @@ public StoreControlValue()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -24,7 +24,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class InitLdapMessage extends GrammarAction<LdapMessageContainerDirect<Message>>
public class InitLdapMessage extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( InitLdapMessage.class );
@@ -60,7 +60,7 @@ public InitLdapMessage()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -27,7 +27,7 @@
import org.apache.directory.api.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.util.Strings;
import org.slf4j.Logger;
@@ -50,7 +50,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreMessageId extends GrammarAction<LdapMessageContainerDirect<Message>>
public class StoreMessageId extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreMessageId.class );
@@ -69,7 +69,7 @@ public StoreMessageId()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
// The current TLV should be a integer
// We get it and store it in MessageId
@@ -24,7 +24,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
import org.apache.directory.api.ldap.model.message.LdapResult;
import org.apache.directory.api.ldap.model.message.Message;
@@ -45,7 +45,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AddReferral extends GrammarAction<LdapMessageContainerDirect<Message>>
public class AddReferral extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( AddReferral.class );
@@ -64,7 +64,7 @@ public AddReferral()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -24,7 +24,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.LdapResult;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.ldap.model.message.Referral;
@@ -43,7 +43,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class InitReferrals extends GrammarAction<LdapMessageContainerDirect<Message>>
public class InitReferrals extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( InitReferrals.class );
@@ -61,7 +61,7 @@ public InitReferrals()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container ) throws DecoderException
public void action( LdapMessageContainer<Message> container ) throws DecoderException
{
TLV tlv = container.getCurrentTLV();

@@ -23,7 +23,7 @@
import org.apache.directory.api.asn1.ber.grammar.GrammarAction;
import org.apache.directory.api.asn1.ber.tlv.TLV;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainerDirect;
import org.apache.directory.api.ldap.codec.api.LdapMessageContainer;
import org.apache.directory.api.ldap.model.message.LdapResult;
import org.apache.directory.api.ldap.model.message.Message;
import org.apache.directory.api.util.Strings;
@@ -42,7 +42,7 @@
* </pre>
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class StoreErrorMessage extends GrammarAction<LdapMessageContainerDirect<Message>>
public class StoreErrorMessage extends GrammarAction<LdapMessageContainer<Message>>
{
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger( StoreErrorMessage.class );
@@ -60,7 +60,7 @@ public StoreErrorMessage()
* {@inheritDoc}
*/
@Override
public void action( LdapMessageContainerDirect<Message> container )
public void action( LdapMessageContainer<Message> container )
{
// Get the Value and store it in the BindResponse
TLV tlv = container.getCurrentTLV();

0 comments on commit ef9080f

Please sign in to comment.