Rename DecideResult.PASS to DecideResult.NONE for clarity

* DecideResult.java + references
    PASS was confusable with ACCEPT; NONE better conveys "no decision"
This commit is contained in:
gojomo
2009-08-14 21:31:11 +00:00
parent b78fce045b
commit 5c93d7bd28
9 changed files with 12 additions and 12 deletions
@@ -35,7 +35,7 @@ public enum DecideResult {
ACCEPT,
/** Indicates the URI was neither accepted nor rejected. */
PASS,
NONE,
/** Indicates the URI was rejected. */
REJECT;
@@ -60,10 +60,10 @@ public abstract class DecideRule implements Serializable, HasKeyedProperties {
public DecideResult decisionFor(ProcessorURI uri) {
if (!getEnabled()) {
return DecideResult.PASS;
return DecideResult.NONE;
}
DecideResult result = innerDecide(uri);
if (result == DecideResult.PASS) {
if (result == DecideResult.NONE) {
return result;
}
@@ -39,7 +39,7 @@ public class DecideRuleSequence extends DecideRule {
}
public DecideResult innerDecide(ProcessorURI uri) {
DecideResult result = DecideResult.PASS;
DecideResult result = DecideResult.NONE;
List<DecideRule> rules = getRules();
int max = rules.size();
for (int i = 0; i < max; i++) {
@@ -50,7 +50,7 @@ public class DecideRuleSequence extends DecideRule {
LOGGER.finest("DecideRule #" + i + " " +
rule.getClass().getName() + " returned " + r);
}
if (r != DecideResult.PASS) {
if (r != DecideResult.NONE) {
result = r;
}
}
@@ -73,7 +73,7 @@ public class PathologicalPathDecideRule extends DecideRule {
if (p.matcher(uri.getUURI().toString()).matches()) {
return DecideResult.REJECT;
} else {
return DecideResult.PASS;
return DecideResult.NONE;
}
}
@@ -53,7 +53,7 @@ public abstract class PredicatedDecideRule extends DecideRule {
if (evaluate(uri)) {
return getDecision();
}
return DecideResult.PASS;
return DecideResult.NONE;
}
protected abstract boolean evaluate(ProcessorURI object);
@@ -49,7 +49,7 @@ public class PrerequisiteAcceptDecideRule extends DecideRule {
hopsPath.charAt(hopsPath.length()-1) == Hop.PREREQ.getHopChar()) {
return DecideResult.ACCEPT;
}
return DecideResult.PASS;
return DecideResult.NONE;
}
@@ -133,7 +133,7 @@ implements ApplicationContextAware, InitializingBean {
return (DecideResult)engine.eval("decisionFor(object)");
} catch (ScriptException e) {
logger.log(Level.WARNING,e.getMessage(),e);
return DecideResult.PASS;
return DecideResult.NONE;
}
}
}
@@ -48,6 +48,6 @@ public class SeedAcceptDecideRule extends DecideRule {
if (uri.isSeed()) {
return DecideResult.ACCEPT;
}
return DecideResult.PASS;
return DecideResult.NONE;
}
}
@@ -87,7 +87,7 @@ public class ScopePlusOneDecideRule extends SurtPrefixedDecideRule {
UURI via = uri.getVia();
if (via == null) {
// If there is no via and the URL doesn't match scope,reject it
return DecideResult.PASS;
return DecideResult.NONE;
}
// If the via is within scope, accept it
boolean result = isInScope (via, set);
@@ -99,7 +99,7 @@ public class ScopePlusOneDecideRule extends SurtPrefixedDecideRule {
return DecideResult.ACCEPT;
}
}
return DecideResult.PASS;
return DecideResult.NONE;
}
/**