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 2015/05/25 08:24:21 UTC
svn commit: r1681561 [1/2] - in /directory/shared/trunk:
asn1/api/src/main/java/org/apache/directory/api/asn1/
asn1/api/src/main/java/org/apache/directory/api/asn1/util/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/
dsml/engine/src/main...
Author: elecharny
Date: Mon May 25 06:24:20 2015
New Revision: 1681561
URL: http://svn.apache.org/r1681561
Log:
Fixed some Sonar issues
Modified:
directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/EncoderException.java
directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1StringUtils.java
directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/BerValue.java
directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java
directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifReader.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/ldif/LdifUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/Strings.java
Modified: directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/EncoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/EncoderException.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/EncoderException.java (original)
+++ directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/EncoderException.java Mon May 25 06:24:20 2015
@@ -44,4 +44,16 @@ public class EncoderException extends Ex
{
super( message );
}
+
+
+ /**
+ * Creates a new instance of this exception with an useful message.
+ *
+ * @param message a useful message relating to the encoder specific error.
+ * @param cause The parent exception
+ */
+ public EncoderException( String message, Exception cause )
+ {
+ super( message, cause );
+ }
}
Modified: directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1StringUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1StringUtils.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1StringUtils.java (original)
+++ directory/shared/trunk/asn1/api/src/main/java/org/apache/directory/api/asn1/util/Asn1StringUtils.java Mon May 25 06:24:20 2015
@@ -49,8 +49,16 @@ public final class Asn1StringUtils
*/
public static String dumpByte( byte octet )
{
- return new String( new byte[]
- { '0', 'x', HEX_CHAR[( octet & 0x00F0 ) >> 4], HEX_CHAR[octet & 0x000F] } );
+ try
+ {
+ return new String( new byte[]
+ { '0', 'x', HEX_CHAR[( octet & 0x00F0 ) >> 4], HEX_CHAR[octet & 0x000F] }, "UTF-8" );
+ }
+ catch ( UnsupportedEncodingException e )
+ {
+ // Can't happen
+ return "";
+ }
}
Modified: directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/BerValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/BerValue.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/BerValue.java (original)
+++ directory/shared/trunk/asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/tlv/BerValue.java Mon May 25 06:24:20 2015
@@ -658,7 +658,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -692,7 +692,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -728,7 +728,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -760,7 +760,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -788,7 +788,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -816,7 +816,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -845,7 +845,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -873,7 +873,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
@@ -906,7 +906,7 @@ public class BerValue
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ) );
+ throw new EncoderException( I18n.err( I18n.ERR_00004_PDU_BUFFER_SIZE_TOO_SMALL ), boe );
}
}
Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java Mon May 25 06:24:20 2015
@@ -46,6 +46,7 @@ import org.apache.directory.api.dsmlv2.r
import org.apache.directory.api.dsmlv2.response.CompareResponseDsml;
import org.apache.directory.api.dsmlv2.response.DelResponseDsml;
import org.apache.directory.api.dsmlv2.response.ErrorResponse;
+import org.apache.directory.api.dsmlv2.response.ErrorResponse.ErrorResponseType;
import org.apache.directory.api.dsmlv2.response.ExtendedResponseDsml;
import org.apache.directory.api.dsmlv2.response.ModDNResponseDsml;
import org.apache.directory.api.dsmlv2.response.ModifyResponseDsml;
@@ -53,7 +54,6 @@ import org.apache.directory.api.dsmlv2.r
import org.apache.directory.api.dsmlv2.response.SearchResultDoneDsml;
import org.apache.directory.api.dsmlv2.response.SearchResultEntryDsml;
import org.apache.directory.api.dsmlv2.response.SearchResultReferenceDsml;
-import org.apache.directory.api.dsmlv2.response.ErrorResponse.ErrorResponseType;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -130,6 +130,8 @@ public class Dsmlv2Engine
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( Dsmlv2Engine.class );
+
+ private static final String BODY_ENVELOPE = "</Body></Envelope>";
/**
@@ -312,7 +314,7 @@ public class Dsmlv2Engine
respWriter.write( batchResponse.toDsml() );
if ( generateSoapResp )
{
- respWriter.write( "</Body></Envelope>" );
+ respWriter.write( BODY_ENVELOPE );
}
respWriter.flush();
@@ -341,7 +343,7 @@ public class Dsmlv2Engine
respWriter.write( batchResponse.toDsml() );
if ( generateSoapResp )
{
- respWriter.write( "</Body></Envelope>" );
+ respWriter.write( BODY_ENVELOPE );
}
respWriter.flush();
@@ -405,7 +407,7 @@ public class Dsmlv2Engine
if ( generateSoapResp )
{
- respWriter.write( "</Body></Envelope>" );
+ respWriter.write( BODY_ENVELOPE );
}
respWriter.flush();
@@ -499,7 +501,7 @@ public class Dsmlv2Engine
if ( generateSoapResp )
{
- respWriter.write( "</Body></Envelope>" );
+ respWriter.write( BODY_ENVELOPE );
}
respWriter.flush();
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/Dsmlv2Grammar.java Mon May 25 06:24:20 2015
@@ -69,6 +69,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.util.Base64;
+import org.apache.directory.api.util.Strings;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -81,6 +82,27 @@ import org.xmlpull.v1.XmlPullParserExcep
public final class Dsmlv2Grammar extends AbstractGrammar implements Grammar
{
private LdapApiService codec = LdapApiServiceFactory.getSingleton();
+
+ /** Some literal */
+ private static final String BATCH_REQUEST = "batchRequest";
+ private static final String ABANDON_REQUEST = "abandonRequest";
+ private static final String ADD_REQUEST = "addRequest";
+ private static final String COMPARE_REQUEST = "compareRequest";
+ private static final String DEL_REQUEST = "delRequest";
+ private static final String EXTENDED_REQUEST = "extendedRequest";
+ private static final String MOD_DN_REQUEST = "modDNRequest";
+ private static final String MODIFY_REQUEST = "modifyRequest";
+ private static final String SEARCH_REQUEST = "searchRequest";
+ private static final String CONTROL = "control";
+ private static final String CONTROL_VALUE = "controlValue";
+ private static final String ATTR = "attr";
+ private static final String VALUE = "value";
+ private static final String MODIFICATION = "modification";
+ private static final String SUBSTRINGS = "substrings";
+ private static final String REQUEST_ID = "requestID";
+ private static final String NAME = "name";
+ private static final String TRUE = "true";
+ private static final String FALSE = "false";
/**
@@ -104,37 +126,37 @@ public final class Dsmlv2Grammar extends
// ** OPEN BATCH REQUEST **
// State: [INIT_GRAMMAR_STATE] - Tag: <batchRequest>
- super.transitions[Dsmlv2StatesEnum.INIT_GRAMMAR_STATE.ordinal()].put( new Tag( "batchRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.INIT_GRAMMAR_STATE.ordinal()].put( new Tag( BATCH_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.INIT_GRAMMAR_STATE, Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
batchRequestCreation ) );
// ** CLOSE BATCH REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: </batchRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()]
- .put( new Tag( "batchRequest", Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
+ .put( new Tag( BATCH_REQUEST, Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_END_TAG, null ) );
//state: [BATCHREQUEST_LOOP] - Tag: </batchRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "batchRequest", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( BATCH_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.GRAMMAR_END, null ) );
// ** ABANDON REQUEST **
// State: [BATCHREQUEST_START_TAG] - Tag: <abandonRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put(
- new Tag( "abandonRequest", Tag.START ),
+ new Tag( ABANDON_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG,
abandonRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <abandonRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "abandonRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( ABANDON_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG,
abandonRequestCreation ) );
// ** ADD REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <addRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( "addRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( ADD_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.ADD_REQUEST_START_TAG,
addRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <addRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "addRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( ADD_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.ADD_REQUEST_START_TAG,
addRequestCreation ) );
@@ -147,64 +169,64 @@ public final class Dsmlv2Grammar extends
// ** COMPARE REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <compareRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put(
- new Tag( "compareRequest", Tag.START ),
+ new Tag( COMPARE_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.COMPARE_REQUEST_START_TAG,
compareRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <compareRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "compareRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( COMPARE_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.COMPARE_REQUEST_START_TAG,
compareRequestCreation ) );
// ** DEL REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <delRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( "delRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( DEL_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.DEL_REQUEST_START_TAG,
delRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <delRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "delRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( DEL_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.DEL_REQUEST_START_TAG,
delRequestCreation ) );
// ** EXTENDED REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <extendedRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put(
- new Tag( "extendedRequest", Tag.START ),
+ new Tag( EXTENDED_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG, extendedRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <extendedRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "extendedRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( EXTENDED_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG,
extendedRequestCreation ) );
// ** MOD Dn REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <modDNRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( "modDNRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( MOD_DN_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG, modDNRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <modDNRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "modDNRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( MOD_DN_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG,
modDNRequestCreation ) );
// ** MODIFY REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <modifyRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put(
- new Tag( "modifyRequest", Tag.START ),
+ new Tag( MODIFY_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG,
modifyRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <modifyRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "modifyRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( MODIFY_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG,
modifyRequestCreation ) );
// ** SEARCH REQUEST **
// state: [BATCHREQUEST_START_TAG] - Tag: <searchRequest>
super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put(
- new Tag( "searchRequest", Tag.START ),
+ new Tag( SEARCH_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG, Dsmlv2StatesEnum.SEARCH_REQUEST_START_TAG,
searchRequestCreation ) );
// state: [BATCHREQUEST_LOOP] - Tag: <searchRequest>
- super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( "searchRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_LOOP.ordinal()].put( new Tag( SEARCH_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.SEARCH_REQUEST_START_TAG,
searchRequestCreation ) );
@@ -218,40 +240,40 @@ public final class Dsmlv2Grammar extends
// State: [ABANDON_REQUEST_START_TAG] - Tag: </abandonRequest>
super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG.ordinal()]
- .put( new Tag( "abandonRequest", Tag.END ), new GrammarTransition(
+ .put( new Tag( ABANDON_REQUEST, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [ABANDON_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ABANDON_REQUEST_START_TAG,
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [ABANDON_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "controlValue", Tag.START ), new GrammarTransition(
+ new Tag( CONTROL_VALUE, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [ABANDON_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG, null ) );
// State: [ABANDON_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG, null ) );
// State: [ABANDON_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [ABANDON_REQUEST_CONTROL_END_TAG] - Tag: </abandonRequest>
- super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "abandonRequest",
+ super.transitions[Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( ABANDON_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ABANDON_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
@@ -267,70 +289,70 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// state: [ADD_REQUEST_START_TAG] -> Tag: </addRequest>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( "addRequest", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( ADD_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [ADD_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_START_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [ADD_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "controlValue",
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL_VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [ADD_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put(
- new Tag( "control", Tag.END ),
+ new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG, null ) );
// State: [ADD_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG, null ) );
// State: [ADD_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [ADD_REQUEST_CONTROL_END_TAG] - Tag: </addRequest>
super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "addRequest", Tag.END ),
+ new Tag( ADD_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
null ) );
// State: [ADD_REQUEST_START_TAG] - Tag: <attr>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( "attr", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_START_TAG.ordinal()].put( new Tag( ATTR, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_START_TAG, Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG,
addRequestAddAttribute ) );
// State: [ADD_REQUEST_CONTROL_END_TAG] - Tag: <attr>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "attr", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( ATTR, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG, addRequestAddAttribute ) );
// State: [ADD_REQUEST_ATTR_END_TAG] - Tag: <attr>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG.ordinal()].put( new Tag( "attr", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG.ordinal()].put( new Tag( ATTR, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG, addRequestAddAttribute ) );
// State: [ADD_REQUEST_ATTR_START_TAG] - Tag: </attr>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG.ordinal()].put( new Tag( "attr", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG.ordinal()].put( new Tag( ATTR, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG, null ) );
// State: [ADD_REQUEST_ATTR_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG.ordinal()].put( new Tag( "value", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG.ordinal()].put( new Tag( VALUE, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG,
Dsmlv2StatesEnum.ADD_REQUEST_ATTR_START_TAG, addRequestAddValue ) );
// State: [ADD_REQUEST_ATTR_END_TAG] - Tag: </addRequest>
super.transitions[Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG.ordinal()]
- .put( new Tag( "addRequest", Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG,
+ .put( new Tag( ADD_REQUEST, Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.ADD_REQUEST_ATTR_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
//====================================================
@@ -346,31 +368,31 @@ public final class Dsmlv2Grammar extends
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [AUTH_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_START_TAG,
Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [AUTH_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
- super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "controlValue",
+ super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL_VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.AUTH_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [AUTH_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_END_TAG, null ) );
// State: [AUTH_REQUEST_CONTROL_START_TAG] - Tag: </control>
super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "control", Tag.END ),
+ new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_END_TAG, null ) );
// State: [AUTH_REQUEST_CONTROL_END_TAG] - Tag: <control>
super.transitions[Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "control", Tag.START ),
+ new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.AUTH_REQUEST_CONTROL_START_TAG, controlCreation ) );
@@ -392,36 +414,36 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_VALUE_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// State: [COMPARE_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_START_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [COMPARE_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "controlValue", Tag.START ), new GrammarTransition(
+ new Tag( CONTROL_VALUE, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [COMPARE_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG, null ) );
// State: [COMPARE_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG, null ) );
// State: [COMPARE_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [COMPARE_REQUEST_CONTROL_END_TAG] - Tag: </compareRequest>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "compareRequest",
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( COMPARE_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
@@ -438,7 +460,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_START_TAG, compareRequestAddAssertion ) );
// State: [COMPARE_REQUEST_ASSERTION_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_START_TAG,
Dsmlv2StatesEnum.COMPARE_REQUEST_VALUE_END_TAG, compareRequestAddValue ) );
@@ -451,7 +473,7 @@ public final class Dsmlv2Grammar extends
// State: [COMPARE_REQUEST_ASSERTION_END_TAG] - Tag: </compareRequest>
super.transitions[Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_END_TAG.ordinal()].put(
- new Tag( "compareRequest", Tag.END ), new GrammarTransition(
+ new Tag( COMPARE_REQUEST, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.COMPARE_REQUEST_ASSERTION_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
//====================================================
@@ -463,39 +485,39 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROLVALUE_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// State: [DEL_REQUEST_START_TAG] - Tag: </delRequest>
- super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_START_TAG.ordinal()].put( new Tag( "delRequest", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_START_TAG.ordinal()].put( new Tag( DEL_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [DEL_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_START_TAG,
Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [DEL_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
- super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "controlValue",
+ super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL_VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.DEL_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [DEL_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put(
- new Tag( "control", Tag.END ),
+ new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG, null ) );
// State: [DEL_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG, null ) );
// State: [DEL_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [DEL_REQUEST_CONTROL_END_TAG] - Tag: </delRequest>
super.transitions[Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "delRequest", Tag.END ),
+ new Tag( DEL_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.DEL_REQUEST_CONTROL_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
null ) );
@@ -510,37 +532,37 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_REQUESTVALUE_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// State: [EXTENDED_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [EXTENDED_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "controlValue", Tag.START ), new GrammarTransition(
+ new Tag( CONTROL_VALUE, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [EXTENDED_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG, null ) );
// State: [EXTENDED_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG, null ) );
// State: [EXTENDED_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [EXTENDED_REQUEST_CONTROL_END_TAG] - Tag: </extendedRequest>
super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "extendedRequest", Tag.END ), new GrammarTransition(
+ new Tag( EXTENDED_REQUEST, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.EXTENDED_REQUEST_CONTROL_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [EXTENDED_REQUEST_START_TAG] - Tag: <requestName>
@@ -557,7 +579,7 @@ public final class Dsmlv2Grammar extends
// State: [EXTENDED_REQUEST_REQUESTNAME_END_TAG] - Tag: </extendedRequest>
super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_REQUESTNAME_END_TAG.ordinal()].put( new Tag(
- "extendedRequest",
+ EXTENDED_REQUEST,
Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_REQUESTNAME_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
@@ -569,7 +591,7 @@ public final class Dsmlv2Grammar extends
// State: [EXTENDED_REQUEST_REQUESTVALUE_END_TAG] - Tag: </requestRequest>
super.transitions[Dsmlv2StatesEnum.EXTENDED_REQUEST_REQUESTVALUE_END_TAG.ordinal()].put( new Tag(
- "extendedRequest",
+ EXTENDED_REQUEST,
Tag.END ), new GrammarTransition( Dsmlv2StatesEnum.EXTENDED_REQUEST_REQUESTVALUE_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
@@ -583,41 +605,41 @@ public final class Dsmlv2Grammar extends
// State: [MODIFY_DN_REQUEST_START_TAG] - Tag: </modDNRequest>
super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG.ordinal()].put(
- new Tag( "modDNRequest", Tag.END ),
+ new Tag( MOD_DN_REQUEST, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
null ) );
// State: [MODIFY_DN_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [MODIFY_DN_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "controlValue", Tag.START ), new GrammarTransition(
+ new Tag( CONTROL_VALUE, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG, null ) );
// State: [MODIFY_DN_REQUEST_CONTROL_START_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG, null ) );
// State: [MODIFY_DN_REQUEST_CONTROL_END_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [MODIFY_DN_REQUEST_CONTROL_END_TAG] - Tag: </modDNRequest>
- super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "modDNRequest",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( MOD_DN_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
@@ -635,88 +657,88 @@ public final class Dsmlv2Grammar extends
// State: [MODIFY_REQUEST_START_TAG] - Tag: </modifyRequest>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG.ordinal()]
- .put( new Tag( "modifyRequest", Tag.END ), new GrammarTransition(
+ .put( new Tag( MODIFY_REQUEST, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
// State: [MODIFY_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [MODIFY_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "controlValue",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL_VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [MODIFY_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG, null ) );
// State: [MODIFY_REQUEST_CONTROL_START_TAG] - Tag: </control>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "control", Tag.END ),
+ new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG, null ) );
// State: [MODIFY_REQUEST_CONTROL_END_TAG] - Tag: <control>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "control", Tag.START ),
+ new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [MODIFY_REQUEST_CONTROL_END_TAG] - Tag: </modifyRequest>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "modifyRequest",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( MODIFY_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
null ) );
// State: [MODIFY_REQUEST_CONTROL_END_TAG] - Tag: <modification>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "modification",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( MODIFICATION,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG, modifyRequestAddModification ) );
// State: [MODIFY_REQUEST_START_TAG] - Tag: <modification>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG.ordinal()].put(
- new Tag( "modification", Tag.START ),
+ new Tag( MODIFICATION, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG, modifyRequestAddModification ) );
// State: [MODIFY_REQUEST_MODIFICATION_END_TAG] - Tag: <modification>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG.ordinal()].put(
- new Tag( "modification", Tag.START ), new GrammarTransition(
+ new Tag( MODIFICATION, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG, modifyRequestAddModification ) );
// State: [MODIFY_REQUEST_MODIFICATION_START_TAG] - Tag: </modification>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG.ordinal()].put(
- new Tag( "modification", Tag.END ), new GrammarTransition(
+ new Tag( MODIFICATION, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG, null ) );
// State: [MODIFY_REQUEST_MODIFICATION_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_START_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG, modifyRequestAddValue ) );
// State: [MODIFY_REQUEST_VALUE_END_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG.ordinal()].put( new Tag( "value", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG.ordinal()].put( new Tag( VALUE, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG, modifyRequestAddValue ) );
// State: [MODIFY_REQUEST_VALUE_END_TAG] - Tag: </modification>
- super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG.ordinal()].put( new Tag( "modification",
+ super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG.ordinal()].put( new Tag( MODIFICATION,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.MODIFY_REQUEST_VALUE_END_TAG,
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG, null ) );
// State: [MODIFY_REQUEST_MODIFICATION_END_TAG] - Tag: </modifyRequest>
super.transitions[Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG.ordinal()].put(
- new Tag( "modifyRequest", Tag.END ), new GrammarTransition(
+ new Tag( MODIFY_REQUEST, Tag.END ), new GrammarTransition(
Dsmlv2StatesEnum.MODIFY_REQUEST_MODIFICATION_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
//====================================================
@@ -732,36 +754,36 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTE_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// State: [SEARCH_REQUEST_START_TAG] - Tag: <control>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_START_TAG.ordinal()].put( new Tag( "control", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_START_TAG.ordinal()].put( new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [SEARCH_REQUEST_CONTROL_START_TAG] - Tag: <controlValue>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( "controlValue",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG.ordinal()].put( new Tag( CONTROL_VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROLVALUE_END_TAG, controlValueCreation ) );
// State: [SEARCH_REQUEST_CONTROLVALUE_END_TAG] - Tag: </control>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( "control",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROLVALUE_END_TAG.ordinal()].put( new Tag( CONTROL,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROLVALUE_END_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG, null ) );
// State: [SEARCH_REQUEST_CONTROL_START_TAG] - Tag: </control>
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG.ordinal()].put(
- new Tag( "control", Tag.END ),
+ new Tag( CONTROL, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG, null ) );
// State: [SEARCH_REQUEST_CONTROL_END_TAG] - Tag: <control>
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG.ordinal()].put(
- new Tag( "control", Tag.START ),
+ new Tag( CONTROL, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_START_TAG, controlCreation ) );
// State: [SEARCH_REQUEST_FILTER_END_TAG] - Tag: </searchRequest>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( "searchRequest",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG.ordinal()].put( new Tag( SEARCH_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_CONTROL_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
storeFilter ) );
@@ -797,7 +819,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTES_END_TAG, null ) );
// State: [SEARCH_REQUEST_ATTRIBUTES_END_TAG] - Tag: </searchRequest>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTES_END_TAG.ordinal()].put( new Tag( "searchRequest",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTES_END_TAG.ordinal()].put( new Tag( SEARCH_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTES_END_TAG,
Dsmlv2StatesEnum.BATCHREQUEST_LOOP, storeFilter ) );
@@ -878,14 +900,14 @@ public final class Dsmlv2Grammar extends
//*** SUBSTRINGS ***
// State: [SEARCH_REQUEST_FILTER_START_TAG] - Tag: <substrings>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_START_TAG.ordinal()].put( new Tag( "substrings",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_START_TAG.ordinal()].put( new Tag( SUBSTRINGS,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_START_TAG, substringsFilterCreation ) );
// State: [SEARCH_REQUEST_FILTER_LOOP] - Tag: <substrings>
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP.ordinal()].put(
- new Tag( "substrings", Tag.START ),
+ new Tag( SUBSTRINGS, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP,
Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_START_TAG, substringsFilterCreation ) );
@@ -903,7 +925,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_EQUALITYMATCH_START_TAG, equalityMatchFilterCreation ) );
// State: [SEARCH_REQUEST_EQUALITYMATCH_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_EQUALITYMATCH_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_EQUALITYMATCH_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_EQUALITYMATCH_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_VALUE_END_TAG, filterAddValue ) );
@@ -928,7 +950,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_GREATEROREQUAL_START_TAG, greaterOrEqualFilterCreation ) );
// State: [SEARCH_REQUEST_GREATEROREQUAL_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_GREATEROREQUAL_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_GREATEROREQUAL_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_GREATEROREQUAL_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_VALUE_END_TAG, filterAddValue ) );
@@ -953,7 +975,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_LESSOREQUAL_START_TAG, lessOrEqualFilterCreation ) );
// State: [SEARCH_REQUEST_LESSOREQUAL_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_LESSOREQUAL_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_LESSOREQUAL_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_LESSOREQUAL_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_VALUE_END_TAG, filterAddValue ) );
@@ -978,7 +1000,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_APPROXMATCH_START_TAG, approxMatchFilterCreation ) );
// State: [SEARCH_REQUEST_APPROXMATCH_START_TAG] - Tag: <value>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_APPROXMATCH_START_TAG.ordinal()].put( new Tag( "value",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_APPROXMATCH_START_TAG.ordinal()].put( new Tag( VALUE,
Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_APPROXMATCH_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_VALUE_END_TAG, filterAddValue ) );
@@ -1022,7 +1044,7 @@ public final class Dsmlv2Grammar extends
// State: [SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG] - Tag: <value>
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG.ordinal()].put(
- new Tag( "value", Tag.START ), new GrammarTransition(
+ new Tag( VALUE, Tag.START ), new GrammarTransition(
Dsmlv2StatesEnum.SEARCH_REQUEST_EXTENSIBLEMATCH_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_EXTENSIBLEMATCH_VALUE_END_TAG, extensibleMatchAddValue ) );
@@ -1045,7 +1067,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_ATTRIBUTES_START_TAG, null ) );
// State: [SEARCH_REQUEST_FILTER_END_TAG] - Tag: </searchRequest>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_END_TAG.ordinal()].put( new Tag( "searchRequest",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_END_TAG.ordinal()].put( new Tag( SEARCH_REQUEST,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_END_TAG, Dsmlv2StatesEnum.BATCHREQUEST_LOOP,
storeFilter ) );
@@ -1060,7 +1082,7 @@ public final class Dsmlv2Grammar extends
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_END_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
// State: [SEARCH_REQUEST_SUBSTRINGS_START_TAG] - Tag: </substrings>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_START_TAG.ordinal()].put( new Tag( "substrings",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_START_TAG.ordinal()].put( new Tag( SUBSTRINGS,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_SUBSTRINGS_START_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP, null ) );
@@ -1083,7 +1105,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_FINAL_END_TAG, substringsFilterSetFinal ) );
// State: [SEARCH_REQUEST_INITIAL_END_TAG] - Tag: </substrings>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_INITIAL_END_TAG.ordinal()].put( new Tag( "substrings",
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_INITIAL_END_TAG.ordinal()].put( new Tag( SUBSTRINGS,
Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_INITIAL_END_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP, substringsFilterClose ) );
@@ -1105,7 +1127,7 @@ public final class Dsmlv2Grammar extends
Dsmlv2StatesEnum.SEARCH_REQUEST_FINAL_END_TAG, substringsFilterSetFinal ) );
// State: [SEARCH_REQUEST_ANY_END_TAG] - Tag: </substrings>
- super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_ANY_END_TAG.ordinal()].put( new Tag( "substrings", Tag.END ),
+ super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_ANY_END_TAG.ordinal()].put( new Tag( SUBSTRINGS, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_ANY_END_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP, substringsFilterClose ) );
@@ -1117,7 +1139,7 @@ public final class Dsmlv2Grammar extends
// State: [SEARCH_REQUEST_FINAL_END_TAG] - Tag: </substrings>
super.transitions[Dsmlv2StatesEnum.SEARCH_REQUEST_FINAL_END_TAG.ordinal()].put(
- new Tag( "substrings", Tag.END ),
+ new Tag( SUBSTRINGS, Tag.END ),
new GrammarTransition( Dsmlv2StatesEnum.SEARCH_REQUEST_FINAL_END_TAG,
Dsmlv2StatesEnum.SEARCH_REQUEST_FILTER_LOOP, substringsFilterClose ) );
@@ -1151,7 +1173,7 @@ public final class Dsmlv2Grammar extends
new GrammarTransition( Dsmlv2StatesEnum.SOAP_HEADER_END_TAG, Dsmlv2StatesEnum.SOAP_BODY_START_TAG, null ) );
// state: [SOAP_BODY_START_TAG] -> Tag: <batchRequest>
- super.transitions[Dsmlv2StatesEnum.SOAP_BODY_START_TAG.ordinal()].put( new Tag( "batchRequest", Tag.START ),
+ super.transitions[Dsmlv2StatesEnum.SOAP_BODY_START_TAG.ordinal()].put( new Tag( BATCH_REQUEST, Tag.START ),
new GrammarTransition( Dsmlv2StatesEnum.SOAP_BODY_START_TAG, Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
batchRequestCreation ) );
@@ -1205,7 +1227,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the batchRequest's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1297,7 +1319,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
abandonRequest.setMessageId( ParserUtils.parseAndVerifyRequestID( attributeValue, xpp ) );
@@ -1344,7 +1366,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
addRequest.setMessageId( ParserUtils.parseAndVerifyRequestID( attributeValue, xpp ) );
@@ -1391,7 +1413,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
@@ -1474,7 +1496,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1516,7 +1538,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1566,7 +1588,7 @@ public final class Dsmlv2Grammar extends
String attributeId;
// name
- attributeId = xpp.getAttributeValue( "", "name" );
+ attributeId = xpp.getAttributeValue( "", NAME );
if ( attributeId != null )
{
@@ -1632,7 +1654,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1684,7 +1706,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1769,7 +1791,7 @@ public final class Dsmlv2Grammar extends
}
else
{
- extendedRequest.setRequestValue( nextText.trim().getBytes() );
+ extendedRequest.setRequestValue( Strings.getBytesUtf8( nextText.trim() ) );
}
}
}
@@ -1795,7 +1817,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1852,11 +1874,11 @@ public final class Dsmlv2Grammar extends
if ( attributeValue != null )
{
- if ( ( attributeValue.equalsIgnoreCase( "true" ) ) || ( attributeValue.equals( "1" ) ) )
+ if ( ( attributeValue.equalsIgnoreCase( TRUE ) ) || ( attributeValue.equals( "1" ) ) )
{
modifyDNRequest.setDeleteOldRdn( true );
}
- else if ( ( attributeValue.equalsIgnoreCase( "false" ) ) || ( attributeValue.equals( "0" ) ) )
+ else if ( ( attributeValue.equalsIgnoreCase( FALSE ) ) || ( attributeValue.equals( "0" ) ) )
{
modifyDNRequest.setDeleteOldRdn( false );
}
@@ -1902,7 +1924,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -1980,7 +2002,7 @@ public final class Dsmlv2Grammar extends
}
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
@@ -2053,7 +2075,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the request's attributes
String attributeValue;
// requestID
- attributeValue = xpp.getAttributeValue( "", "requestID" );
+ attributeValue = xpp.getAttributeValue( "", REQUEST_ID );
if ( attributeValue != null )
{
@@ -2187,11 +2209,11 @@ public final class Dsmlv2Grammar extends
if ( attributeValue != null )
{
- if ( ( attributeValue.equals( "true" ) ) || ( attributeValue.equals( "1" ) ) )
+ if ( ( attributeValue.equals( TRUE ) ) || ( attributeValue.equals( "1" ) ) )
{
searchRequest.setTypesOnly( true );
}
- else if ( ( attributeValue.equals( "false" ) ) || ( attributeValue.equals( "0" ) ) )
+ else if ( ( attributeValue.equals( FALSE ) ) || ( attributeValue.equals( "0" ) ) )
{
searchRequest.setTypesOnly( false );
}
@@ -2220,7 +2242,7 @@ public final class Dsmlv2Grammar extends
XmlPullParser xpp = container.getParser();
// Checking and adding the request's attribute name
- String attributeName = xpp.getAttributeValue( "", "name" );
+ String attributeName = xpp.getAttributeValue( "", NAME );
if ( attributeName != null )
{
@@ -2262,7 +2284,7 @@ public final class Dsmlv2Grammar extends
// Checking and adding the filter's attributes
String attributeValue;
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
@@ -2303,7 +2325,7 @@ public final class Dsmlv2Grammar extends
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
substringFilter
- .setInitialSubstrings( new String( Base64.decode( nextText.trim().toCharArray() ) ) );
+ .setInitialSubstrings( Strings.utf8ToString( Base64.decode( nextText.trim().toCharArray() ) ) );
}
else
{
@@ -2344,7 +2366,7 @@ public final class Dsmlv2Grammar extends
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- substringFilter.addAnySubstrings( new String( Base64.decode( nextText.trim().toCharArray() ) ) );
+ substringFilter.addAnySubstrings( Strings.utf8ToString( Base64.decode( nextText.trim().toCharArray() ) ) );
}
else
{
@@ -2386,7 +2408,7 @@ public final class Dsmlv2Grammar extends
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
substringFilter
- .setFinalSubstrings( new String( Base64.decode( nextText.trim().toCharArray() ) ) );
+ .setFinalSubstrings( Strings.utf8ToString( Base64.decode( nextText.trim().toCharArray() ) ) );
}
else
{
@@ -2522,7 +2544,7 @@ public final class Dsmlv2Grammar extends
AttributeValueAssertion assertion = new AttributeValueAssertion();
// Checking and adding the filter's attributes
- String attributeName = xpp.getAttributeValue( "", "name" );
+ String attributeName = xpp.getAttributeValue( "", NAME );
if ( attributeName != null )
{
@@ -2567,7 +2589,7 @@ public final class Dsmlv2Grammar extends
AttributeValueAssertion assertion = new AttributeValueAssertion();
// Checking and adding the filter's attributes
- String attributeName = xpp.getAttributeValue( "", "name" );
+ String attributeName = xpp.getAttributeValue( "", NAME );
if ( attributeName != null )
{
@@ -2614,11 +2636,11 @@ public final class Dsmlv2Grammar extends
// Checking and adding the filter's attributes
String attributeValue;
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
- assertion.setAttributeDesc( new String( attributeValue.getBytes() ) );
+ assertion.setAttributeDesc( attributeValue );
}
else
{
@@ -2659,7 +2681,7 @@ public final class Dsmlv2Grammar extends
AttributeValueAssertion assertion = new AttributeValueAssertion();
// Checking and adding the filter's attributes
- String attributeName = xpp.getAttributeValue( "", "name" );
+ String attributeName = xpp.getAttributeValue( "", NAME );
if ( attributeName != null )
{
@@ -2760,11 +2782,11 @@ public final class Dsmlv2Grammar extends
// Checking and adding the filter's attributes
String attributeValue;
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
- presentFilter.setAttributeDescription( new String( attributeValue.getBytes() ) );
+ presentFilter.setAttributeDescription( attributeValue );
}
else
{
@@ -2827,11 +2849,11 @@ public final class Dsmlv2Grammar extends
if ( attributeValue != null )
{
- if ( ( attributeValue.equals( "true" ) ) || ( attributeValue.equals( "1" ) ) )
+ if ( ( attributeValue.equals( TRUE ) ) || ( attributeValue.equals( "1" ) ) )
{
extensibleMatchFilter.setDnAttributes( true );
}
- else if ( ( attributeValue.equals( "false" ) ) || ( attributeValue.equals( "0" ) ) )
+ else if ( ( attributeValue.equals( FALSE ) ) || ( attributeValue.equals( "0" ) ) )
{
extensibleMatchFilter.setDnAttributes( false );
}
@@ -2854,7 +2876,7 @@ public final class Dsmlv2Grammar extends
}
// name
- attributeValue = xpp.getAttributeValue( "", "name" );
+ attributeValue = xpp.getAttributeValue( "", NAME );
if ( attributeValue != null )
{
@@ -2937,11 +2959,11 @@ public final class Dsmlv2Grammar extends
if ( attributeValue != null )
{
- if ( attributeValue.equals( "true" ) )
+ if ( attributeValue.equals( TRUE ) )
{
control.setCritical( true );
}
- else if ( attributeValue.equals( "false" ) )
+ else if ( attributeValue.equals( FALSE ) )
{
control.setCritical( false );
}
@@ -2982,7 +3004,7 @@ public final class Dsmlv2Grammar extends
}
else
{
- control.setValue( nextText.trim().getBytes() );
+ control.setValue( Strings.getBytesUtf8( nextText.trim() ) );
}
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/SearchRequestDsml.java Mon May 25 06:24:20 2015
@@ -65,6 +65,11 @@ public class SearchRequestDsml
extends AbstractResultResponseRequestDsml<SearchRequest, SearchResultDone>
implements SearchRequest
{
+ /** Some string constants */
+ private static final String DEREF_ALIASES = "derefAliases";
+ private static final String NAME = "name";
+ private static final String VALUE = "value";
+
/** A temporary storage for a terminal Filter */
private Filter terminalFilter;
@@ -371,19 +376,19 @@ public class SearchRequestDsml
switch ( derefAliases )
{
case NEVER_DEREF_ALIASES:
- element.addAttribute( "derefAliases", "neverDerefAliases" );
+ element.addAttribute( DEREF_ALIASES, "neverDerefAliases" );
break;
case DEREF_ALWAYS:
- element.addAttribute( "derefAliases", "derefAlways" );
+ element.addAttribute( DEREF_ALIASES, "derefAlways" );
break;
case DEREF_FINDING_BASE_OBJ:
- element.addAttribute( "derefAliases", "derefFindingBaseObj" );
+ element.addAttribute( DEREF_ALIASES, "derefFindingBaseObj" );
break;
case DEREF_IN_SEARCHING:
- element.addAttribute( "derefAliases", "derefInSearching" );
+ element.addAttribute( DEREF_ALIASES, "derefInSearching" );
break;
default:
@@ -421,7 +426,7 @@ public class SearchRequestDsml
for ( String entryAttribute : attributes )
{
- attributesElement.addElement( "attribute" ).addAttribute( "name", entryAttribute );
+ attributesElement.addElement( "attribute" ).addAttribute( NAME, entryAttribute );
}
}
@@ -481,7 +486,7 @@ public class SearchRequestDsml
SubstringNode substringFilter = ( SubstringNode ) filter;
- newElement.addAttribute( "name", substringFilter.getAttribute() );
+ newElement.addAttribute( NAME, substringFilter.getAttribute() );
String initial = substringFilter.getInitial();
@@ -529,7 +534,7 @@ public class SearchRequestDsml
}
String attributeName = ( ( SimpleNode<?> ) filter ).getAttribute();
- newElement.addAttribute( "name", attributeName );
+ newElement.addAttribute( NAME, attributeName );
Value<?> value = ( ( SimpleNode<?> ) filter ).getValue();
if ( value != null )
@@ -541,14 +546,14 @@ public class SearchRequestDsml
element.getDocument().getRootElement().add( xsdNamespace );
element.getDocument().getRootElement().add( xsiNamespace );
- Element valueElement = newElement.addElement( "value" ).addText(
+ Element valueElement = newElement.addElement( VALUE ).addText(
ParserUtils.base64Encode( value ) );
valueElement
.addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
}
else
{
- newElement.addElement( "value" ).setText( value.getString() );
+ newElement.addElement( VALUE ).setText( value.getString() );
}
}
}
@@ -558,7 +563,7 @@ public class SearchRequestDsml
{
Element newElement = element.addElement( "present" );
- newElement.addAttribute( "name", ( ( PresenceNode ) filter ).getAttribute() );
+ newElement.addAttribute( NAME, ( ( PresenceNode ) filter ).getAttribute() );
}
// EXTENSIBLEMATCH
@@ -576,13 +581,13 @@ public class SearchRequestDsml
element.getDocument().getRootElement().add( xsdNamespace );
element.getDocument().getRootElement().add( xsiNamespace );
- Element valueElement = newElement.addElement( "value" ).addText(
+ Element valueElement = newElement.addElement( VALUE ).addText(
ParserUtils.base64Encode( value.getValue() ) );
valueElement.addAttribute( new QName( "type", xsiNamespace ), "xsd:" + ParserUtils.BASE64BINARY );
}
else
{
- newElement.addElement( "value" ).setText( value.getString() );
+ newElement.addElement( VALUE ).setText( value.getString() );
}
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/response/Dsmlv2ResponseGrammar.java Mon May 25 06:24:20 2015
@@ -1437,7 +1437,7 @@ public final class Dsmlv2ResponseGrammar
}
else
{
- control.setValue( nextText.trim().getBytes() );
+ control.setValue( Strings.getBytesUtf8( nextText.trim() ) );
}
}
}
Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java?rev=1681561&r1=1681560&r2=1681561&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/api/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureRequestDecorator.java Mon May 25 06:24:20 2015
@@ -222,7 +222,7 @@ public class StoredProcedureRequestDecor
}
catch ( BufferOverflowException boe )
{
- throw new EncoderException( I18n.err( I18n.ERR_04005 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_04005 ), boe );
}
return bb;