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 2012/09/14 21:19:13 UTC
svn commit: r1384892 - in /directory:
apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/
apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/i...
Author: elecharny
Date: Fri Sep 14 19:19:13 2012
New Revision: 1384892
URL: http://svn.apache.org/viewvc?rev=1384892&view=rev
Log:
The ScopeNode class does not need to be generic
Modified:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
directory/shared/branches/shared-mvbt/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java?rev=1384892&r1=1384891&r2=1384892&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java Fri Sep 14 19:19:13 2012
@@ -35,10 +35,10 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OneLevelScopeEvaluator<E> implements Evaluator<ScopeNode<String>>
+public class OneLevelScopeEvaluator<E> implements Evaluator<ScopeNode>
{
/** The ScopeNode containing initial search scope constraints */
- private final ScopeNode<String> node;
+ private final ScopeNode node;
/** The entry identifier of the scope base */
private final String baseId;
@@ -57,7 +57,7 @@ public class OneLevelScopeEvaluator<E> i
* @param db the database used to evaluate scope node
* @throws Exception on db access failure
*/
- public OneLevelScopeEvaluator( Store db, ScopeNode<String> node ) throws Exception
+ public OneLevelScopeEvaluator( Store db, ScopeNode node ) throws Exception
{
this.node = node;
@@ -144,7 +144,7 @@ public class OneLevelScopeEvaluator<E> i
}
- public ScopeNode<String> getExpression()
+ public ScopeNode getExpression()
{
return node;
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java?rev=1384892&r1=1384891&r2=1384892&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java Fri Sep 14 19:19:13 2012
@@ -37,10 +37,10 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SubtreeScopeEvaluator implements Evaluator<ScopeNode<String>>
+public class SubtreeScopeEvaluator implements Evaluator<ScopeNode>
{
/** The ScopeNode containing initial search scope constraints */
- private final ScopeNode<String> node;
+ private final ScopeNode node;
/** The entry identifier of the scope base */
private final String baseId;
@@ -71,7 +71,7 @@ public class SubtreeScopeEvaluator imple
* @param db the database used to evaluate scope node
* @throws Exception on db access failure
*/
- public SubtreeScopeEvaluator( Store db, ScopeNode<String> node ) throws Exception
+ public SubtreeScopeEvaluator( Store db, ScopeNode node ) throws Exception
{
this.db = db;
this.node = node;
@@ -232,7 +232,7 @@ public class SubtreeScopeEvaluator imple
}
- public ScopeNode<String> getExpression()
+ public ScopeNode getExpression()
{
return node;
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1384892&r1=1384891&r2=1384892&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Fri Sep 14 19:19:13 2012
@@ -123,7 +123,7 @@ public class DefaultOptimizer<E> impleme
if ( node instanceof ScopeNode )
{
- count = getScopeScan( ( ScopeNode<String> ) node );
+ count = getScopeScan( ( ScopeNode ) node );
}
else if ( node instanceof AssertionNode )
{
@@ -373,7 +373,7 @@ public class DefaultOptimizer<E> impleme
* @return the scan count for scope
* @throws Exception if any errors result
*/
- private long getScopeScan( ScopeNode<String> node ) throws Exception
+ private long getScopeScan( ScopeNode node ) throws Exception
{
String id = node.getBaseId();
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=1384892&r1=1384891&r2=1384892&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Fri Sep 14 19:19:13 2012
@@ -108,13 +108,13 @@ public class EvaluatorBuilder
return new PresenceEvaluator( ( PresenceNode ) node, db, schemaManager );
case SCOPE:
- if ( ( ( ScopeNode<String> ) node ).getScope() == SearchScope.ONELEVEL )
+ if ( ( ( ScopeNode ) node ).getScope() == SearchScope.ONELEVEL )
{
- return new OneLevelScopeEvaluator<Entry>( db, ( ScopeNode<String> ) node );
+ return new OneLevelScopeEvaluator<Entry>( db, ( ScopeNode ) node );
}
else
{
- return new SubtreeScopeEvaluator( db, ( ScopeNode<String> ) node );
+ return new SubtreeScopeEvaluator( db, ( ScopeNode ) node );
}
case SUBSTRING:
Modified: directory/shared/branches/shared-mvbt/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-mvbt/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java?rev=1384892&r1=1384891&r2=1384892&view=diff
==============================================================================
--- directory/shared/branches/shared-mvbt/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java (original)
+++ directory/shared/branches/shared-mvbt/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java Fri Sep 14 19:19:13 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ScopeNode<ID> extends AbstractExprNode
+public class ScopeNode extends AbstractExprNode
{
/** the scope of this node */
private final SearchScope scope;
@@ -40,7 +40,7 @@ public class ScopeNode<ID> extends Abstr
private final Dn baseDn;
/** the search ID */
- private final ID baseId;
+ private final String baseId;
/** the alias dereferencing mode */
private final AliasDerefMode aliasDerefAliases;
@@ -53,7 +53,7 @@ public class ScopeNode<ID> extends Abstr
* @param baseDn the search base
* @param scope the search scope
*/
- public ScopeNode( AliasDerefMode aliasDerefAliases, Dn baseDn, ID baseId, SearchScope scope )
+ public ScopeNode( AliasDerefMode aliasDerefAliases, Dn baseDn, String baseId, SearchScope scope )
{
super( AssertionType.SCOPE );
this.scope = scope;
@@ -103,7 +103,7 @@ public class ScopeNode<ID> extends Abstr
*
* @return the base ID
*/
- public ID getBaseId()
+ public String getBaseId()
{
return baseId;
}