JENA-938 : Code cleaning (extract of PR #63) Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/34bf660f Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/34bf660f Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/34bf660f
Branch: refs/heads/add-contract-tests Commit: 34bf660f46d3d4c8039b3e52aa9ecaebc834a59d Parents: 669c856 Author: Andy Seaborne <[email protected]> Authored: Wed May 13 21:13:10 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed May 13 21:13:10 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java | 1 + .../org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java | 7 ------- .../java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java | 4 +--- .../java/org/apache/jena/reasoner/rulesys/builtins/Bound.java | 1 - .../java/org/apache/jena/reasoner/rulesys/builtins/Drop.java | 1 - .../org/apache/jena/reasoner/rulesys/builtins/Remove.java | 1 - .../org/apache/jena/reasoner/rulesys/builtins/Unbound.java | 1 - .../java/org/apache/jena/reasoner/rulesys/impl/Generator.java | 1 - .../org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java | 1 - .../org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java | 4 +--- .../java/org/apache/jena/shared/impl/PrefixMappingImpl.java | 2 +- 11 files changed, 4 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java index 471a048..4df6a67 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java @@ -26,6 +26,7 @@ import org.apache.jena.rdf.model.* ; */ public class BagImpl extends ContainerImpl implements Bag { + @SuppressWarnings("hiding") final static public Implementation factory = new Implementation() { @Override public boolean canWrap( Node n, EnhGraph eg ) http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java index ed8dfda..86319d4 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java @@ -151,13 +151,6 @@ public abstract class AbsXMLContext implements ARPErrorNumbers { // if (irie.getViolationCode() == // ViolationCodes.REQUIRED_COMPONENT_MISSING) String msg = irie.getShortMessage(); - String uri = rslt.toString(); -// if (msg.endsWith(uri)) { -// msg = msg.substring(0, msg.length() - uri.length()) + "<" -// + uri + ">"; -// } else { -// msg = "<" + uri + "> " + msg; -// } if (irie.getViolationCode() == ViolationCodes.REQUIRED_COMPONENT_MISSING && irie.getComponent() == IRIComponents.SCHEME) { if (!forErrors.allowRelativeURIs()) http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java index 34f2e72..b2acc03 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java @@ -652,7 +652,7 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar @Override public void performDelete(Triple t) { version++; - boolean removeIsFromBase = fdata.getGraph().contains(t); + //boolean removeIsFromBase = fdata.getGraph().contains(t); fdata.getGraph().delete(t); if (useTGCCaching) { if (transitiveEngine.delete(t)) { @@ -740,12 +740,10 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar for (Iterator<Triple> i = findFull(pattern); i.hasNext(); ) { Triple t = i.next(); Node rNode = t.getObject(); - boolean foundReport = false; if (rNode.isLiteral()) { Object rVal = rNode.getLiteralValue(); if (rVal instanceof Functor) { Functor rFunc = (Functor)rVal; - foundReport = true; StringBuffer description = new StringBuffer(); String nature = rFunc.getName(); String type = rFunc.getArgs()[0].toString(); http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java index cf4d947..73068d5 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java @@ -47,7 +47,6 @@ public class Bound extends BaseBuiltin { */ @Override public boolean bodyCall(Node[] args, int length, RuleContext context) { - BindingEnvironment env = context.getEnv(); for (int i = 0; i < length; i++) { if (getArg(i, args, context) instanceof Node_RuleVariable) return false; } http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java index dc68043..3156d7d 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java @@ -55,7 +55,6 @@ public class Drop extends BaseBuiltin { */ @Override public void headAction(Node[] args, int length, RuleContext context) { - boolean ok = false; InfGraph inf = context.getGraph(); Graph raw = inf.getRawGraph(); Graph deductions = inf.getDeductionsGraph(); http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java index 3a98829..22a05de 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java @@ -47,7 +47,6 @@ public class Remove extends BaseBuiltin { */ @Override public void headAction(Node[] args, int length, RuleContext context) { - boolean ok = false; for (int i = 0; i < length; i++) { Node clauseN = getArg(i, args, context); if (Util.isNumeric(clauseN)) { http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java index dae8f17..39848cc 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java @@ -48,7 +48,6 @@ public class Unbound extends BaseBuiltin { */ @Override public boolean bodyCall(Node[] args, int length, RuleContext context) { - BindingEnvironment env = context.getEnv(); for (int i = 0; i < length; i++) { if ( !(getArg(i, args, context) instanceof Node_RuleVariable) ) return false; } http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java index 5c8b637..faddddb 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java @@ -203,7 +203,6 @@ public class Generator implements LPAgendaEntry, LPInterpreterContext { * Signal dependents that we have new results. */ public void notifyResults() { - LPBRuleEngine engine = interpreter.getEngine(); for ( ConsumerChoicePointFrame cons : consumingCPs ) { cons.setReady(); http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java index 8ce0bbc..3f4fac0 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java @@ -246,7 +246,6 @@ public class LPRuleStore extends RuleStore { for ( Iterator<Map.Entry<Node, List<RuleClauseCode>>> k = predicateMap.entrySet().iterator(); k.hasNext(); ) { Map.Entry<Node, List<RuleClauseCode>> ent = k.next(); - Node pred = ent.getKey(); List<RuleClauseCode> predicateCode = ent.getValue(); predicateCode.addAll( wildRulesForPredicate ); } http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java index 67080a2..575b123 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java @@ -494,7 +494,6 @@ public class RuleClauseCode { * @param goal the triple pattern to be called */ void emitBody(TriplePattern goal, LPRuleStore store) { - int argi = 0; emitBodyPut(goal.getSubject(), 0, false); emitBodyPut(goal.getPredicate(), 1, false); emitBodyPut(goal.getObject(), 2, false); @@ -675,7 +674,6 @@ public class RuleClauseCode { Node_RuleVariable var = null; boolean inFirst = false; boolean inLaterBody = false; - boolean inBuiltin = false; for ( Iterator<TermIndex> oi = occurrences.iterator(); oi.hasNext(); ) { TermIndex occurence = oi.next(); @@ -691,7 +689,6 @@ public class RuleClauseCode { } if ( termNumber > 0 && rule.getBodyElement( termNumber - 1 ) instanceof Functor ) { - inBuiltin = true; } } // Don't think we need to protected builtin's any more, so ignore that test @@ -804,6 +801,7 @@ public class RuleClauseCode { /** * Debug support - not unit testing. */ + // TODO document the derivation of these strings and their intended use? public static void main(String[] args) { try { LPRuleStore store = new LPRuleStore(); http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java index b2b23cb..2852170 100644 --- a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java +++ b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java @@ -74,7 +74,7 @@ public class PrefixMappingImpl implements PrefixMapping public PrefixMapping removeNsPrefix( String prefix ) { checkUnlocked(); - String uri = prefixToURI.remove( prefix ); + prefixToURI.remove( prefix ); regenerateReverseMapping(); return this; }
