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 2016/11/26 10:13:21 UTC
svn commit: r1771455 - in
/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec:
./ controls/search/entryChange/ controls/search/pagedSearch/
controls/search/persistentSearch/ controls/search/subentri...
Author: elecharny
Date: Sat Nov 26 10:13:21 2016
New Revision: 1771455
URL: http://svn.apache.org/viewvc?rev=1771455&view=rev
Log:
o Removed the useless getGrammarName( Grammar ) method
o Removed the getGrammarName( int ) parameter, it's useless
Modified:
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapStatesEnum.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/entryChange/EntryChangeStates.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java
directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapStatesEnum.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapStatesEnum.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/LdapStatesEnum.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -163,26 +162,6 @@ public enum LdapStatesEnum implements St
}
- /**
- * Get the grammar name
- *
- * @param grammar
- * The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof LdapMessageGrammar )
- {
- return "LDAP_MESSAGE_GRAMMAR";
- }
- else
- {
- return "UNKNOWN GRAMMAR";
- }
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/entryChange/EntryChangeStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/entryChange/EntryChangeStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/entryChange/EntryChangeStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/entryChange/EntryChangeStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.search.entryChange;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -71,23 +70,6 @@ public enum EntryChangeStates implements
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof EntryChangeGrammar )
- {
- return "EC_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/pagedSearch/PagedResultsStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.search.pagedSearch;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -59,32 +58,14 @@ public enum PagedResultsStates implement
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "PAGED_SEARCH_GRAMMAR";
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof PagedResultsGrammar )
- {
- return "PAGEDSEARCH_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/persistentSearch/PersistentSearchStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.search.persistentSearch;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -70,23 +69,6 @@ public enum PersistentSearchStates imple
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof PersistentSearchGrammar )
- {
- return "PSEARCH_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/search/subentries/SubentriesStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.search.subentries;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -54,32 +53,14 @@ public enum SubentriesStates implements
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "SUB_ENTRY_GRAMMAR";
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<SubentriesContainer> grammar )
- {
- if ( grammar instanceof SubentriesGrammar )
- {
- return "SUB_ENTRY_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortRequestStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.sort;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -48,32 +47,14 @@ public enum SortRequestStates implements
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "SORT_REQUEST_GRAMMAR";
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof SortRequestGrammar )
- {
- return "SORT_REQUEST_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*
Modified: directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java?rev=1771455&r1=1771454&r2=1771455&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java (original)
+++ directory/shared/branches/shared-value/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/controls/sort/SortResponseStates.java Sat Nov 26 10:13:21 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.codec.controls.sort;
-import org.apache.directory.api.asn1.ber.grammar.Grammar;
import org.apache.directory.api.asn1.ber.grammar.States;
@@ -44,32 +43,14 @@ public enum SortResponseStates implement
/**
* Get the grammar name
*
- * @param grammar The grammar code
* @return The grammar name
*/
- public String getGrammarName( int grammar )
+ public String getGrammarName()
{
return "SORT_RESPONSE_GRAMMAR";
}
- /**
- * Get the grammar name
- *
- * @param grammar The grammar class
- * @return The grammar name
- */
- public String getGrammarName( Grammar<?> grammar )
- {
- if ( grammar instanceof SortResponseGrammar )
- {
- return "SORT_RESPONSE_GRAMMAR";
- }
-
- return "UNKNOWN GRAMMAR";
- }
-
-
/**
* Get the string representing the state
*