[Mulgara-svn] r366 - branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational
pag at mulgara.org
pag at mulgara.org
Tue Aug 21 05:47:50 UTC 2007
Author: pag
Date: 2007-08-21 00:47:50 -0500 (Tue, 21 Aug 2007)
New Revision: 366
Modified:
branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraintDescriptor.java
branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverUnitTest.java
Log:
Some fixes to work with using generics in other places of the project
Modified: branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java
===================================================================
--- branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java 2007-08-21 05:45:35 UTC (rev 365)
+++ branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraint.java 2007-08-21 05:47:50 UTC (rev 366)
@@ -42,27 +42,24 @@
package org.mulgara.resolver.relational;
// Java 2 standard packages
-import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.net.URI;
// Third party packages
-import org.apache.log4j.Logger; // Apache Log4J
+// import org.apache.log4j.Logger; // Apache Log4J
import org.jrdf.graph.URIReference;
// Local classes
import org.mulgara.query.Constraint;
-import org.mulgara.query.LocalNode;
import org.mulgara.query.ConstraintElement;
+import org.mulgara.query.ConstraintExpression;
import org.mulgara.query.ConstraintImpl;
-import org.mulgara.query.Query;
-import org.mulgara.query.QueryException;
+import org.mulgara.query.Value;
import org.mulgara.query.Variable;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.QueryEvaluationContext;
@@ -88,17 +85,24 @@
*/
public class RelationalConstraint implements Constraint {
- /** Logger */
- private static Logger logger =
- Logger.getLogger(RelationalConstraint.class.getName());
+ // /** Logger */
+ // private static Logger logger = Logger.getLogger(RelationalConstraint.class.getName());
- private Set rdfTypeConstraints;
+ /**
+ * Allow newer compiled version of the stub to operate when changes
+ * have not occurred with the class.
+ * NOTE : update this serialVersionUID when a method or a public member is
+ * deleted.
+ */
+ private static final long serialVersionUID = -2930975307291404712L;
- private Map predConstraints;
+ private Set<ConstraintExpression> rdfTypeConstraints;
+ private Map<URIReference,List<Constraint>> predConstraints;
+
private ConstraintElement model;
- private Set variables;
+ private Set<Variable> variables;
private static final URIReference rdftype;
@@ -114,9 +118,9 @@
* Sole constructor.
*/
public RelationalConstraint() {
- this.rdfTypeConstraints = new HashSet();
- this.variables = new HashSet();
- this.predConstraints = new HashMap();
+ this.rdfTypeConstraints = new HashSet<ConstraintExpression>();
+ this.variables = new HashSet<Variable>();
+ this.predConstraints = new HashMap<URIReference,List<Constraint>>();
}
public RelationalConstraint(ConstraintImpl constraint) {
@@ -130,11 +134,9 @@
rdfTypeConstraints.addAll(constraint.rdfTypeConstraints);
- Iterator i = constraint.predConstraints.keySet().iterator();
- while (i.hasNext()) {
- ConstraintElement key = (ConstraintElement)i.next();
- List lhs = (List)constraint.predConstraints.get(key);
- List rhs = (List)predConstraints.get(key);
+ for (URIReference key: constraint.predConstraints.keySet()) {
+ List<Constraint> lhs = constraint.predConstraints.get(key);
+ List<Constraint> rhs = predConstraints.get(key);
if (rhs == null) {
predConstraints.put(key, lhs);
} else {
@@ -150,10 +152,10 @@
rdfTypeConstraints.add(constraint);
} else {
// } else if (constraint.getElement(0) instanceof Variable) {
- List preds = (List)predConstraints.get(constraint.getElement(0));
+ List<Constraint> preds = predConstraints.get(constraint.getElement(0));
if (preds == null) {
- preds = new ArrayList();
- predConstraints.put(constraint.getElement(0), preds);
+ preds = new ArrayList<Constraint>();
+ predConstraints.put((URIReference)constraint.getElement(0), preds);
}
preds.add(constraint);
}
@@ -169,13 +171,13 @@
variables.addAll(constraint.getVariables());
}
- public Set getRdfTypeConstraints() {
+ public Set<ConstraintExpression> getRdfTypeConstraints() {
return rdfTypeConstraints;
}
- public List getConstraintsBySubject(ConstraintElement subj) {
- List list = (List)predConstraints.get(subj);
- return list != null ? list : new ArrayList();
+ public List<Constraint> getConstraintsBySubject(ConstraintElement subj) {
+ List<Constraint> list = predConstraints.get(subj);
+ return list != null ? list : new ArrayList<Constraint>();
}
public ConstraintElement getModel() {
@@ -190,8 +192,7 @@
return false;
}
- public Set getVariables()
- {
+ public Set<Variable> getVariables() {
return variables;
}
@@ -211,22 +212,18 @@
return localized;
}
- static RelationalConstraint bind(Map bindings, RelationalConstraint constraint) throws Exception {
+ static RelationalConstraint bind(Map<Variable,Value> bindings, RelationalConstraint constraint) throws Exception {
RelationalConstraint bound = new RelationalConstraint();
- Iterator i = constraint.rdfTypeConstraints.iterator();
- while (i.hasNext()) {
- bound.rdfTypeConstraints.add(ConstraintOperations.bindVariables(bindings, (Constraint)i.next()));
+ for (ConstraintExpression c: constraint.rdfTypeConstraints) {
+ bound.rdfTypeConstraints.add(ConstraintOperations.bindVariables(bindings, c));
}
- i = constraint.predConstraints.keySet().iterator();
- while (i.hasNext()) {
- URIReference key = (URIReference)i.next();
- List entry = (List)constraint.predConstraints.get(key);
- List bentry = new ArrayList();
- Iterator j = entry.iterator();
- while (j.hasNext()) {
- bentry.add(ConstraintOperations.bindVariables(bindings, (Constraint)j.next()));
+ for (URIReference key: constraint.predConstraints.keySet()) {
+ List<Constraint> entry = constraint.predConstraints.get(key);
+ List<Constraint> bentry = new ArrayList<Constraint>();
+ for (Constraint jc: entry) {
+ bentry.add((Constraint)ConstraintOperations.bindVariables(bindings, jc));
}
constraint.predConstraints.put(key, bentry);
}
Modified: branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraintDescriptor.java
===================================================================
--- branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraintDescriptor.java 2007-08-21 05:45:35 UTC (rev 365)
+++ branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalConstraintDescriptor.java 2007-08-21 05:47:50 UTC (rev 366)
@@ -43,17 +43,18 @@
import java.util.Map;
-import org.apache.log4j.Logger;
+// import org.apache.log4j.Logger;
import org.mulgara.resolver.spi.ConstraintBindingHandler;
import org.mulgara.resolver.spi.ConstraintDescriptor;
import org.mulgara.resolver.spi.ConstraintLocalization;
-import org.mulgara.resolver.spi.ConstraintBindingHandler;
import org.mulgara.resolver.spi.QueryEvaluationContext;
import org.mulgara.query.ModelExpression;
import org.mulgara.query.ConstraintExpression;
import org.mulgara.query.ConstraintElement;
import org.mulgara.query.Constraint;
+import org.mulgara.query.Value;
+import org.mulgara.query.Variable;
import org.mulgara.store.tuples.Tuples;
// FIXME: Need to work out how to delegate this.
@@ -61,9 +62,9 @@
public class RelationalConstraintDescriptor implements ConstraintDescriptor, ConstraintLocalization, ConstraintBindingHandler {
- private static final Logger logger = Logger.getLogger(RelationalConstraintDescriptor.class.getName());
+ // private static final Logger logger = Logger.getLogger(RelationalConstraintDescriptor.class.getName());
- public Class getConstraintClass() {
+ public Class<? extends Constraint> getConstraintClass() {
return RelationalConstraint.class;
}
@@ -92,7 +93,7 @@
return RelationalConstraint.localize(context, (RelationalConstraint)constraint);
}
- public ConstraintExpression bindVariables(Map bindings,
+ public ConstraintExpression bindVariables(Map<Variable,Value> bindings,
ConstraintExpression constraintExpr) throws Exception {
assert constraintExpr instanceof RelationalConstraint;
return RelationalConstraint.bind(bindings, (RelationalConstraint)constraintExpr);
Modified: branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverUnitTest.java 2007-08-21 05:45:35 UTC (rev 365)
+++ branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverUnitTest.java 2007-08-21 05:47:50 UTC (rev 366)
@@ -465,7 +465,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -506,7 +506,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new URIReferenceImpl(new URI("http://www.smith.id/albert")),
new URIReferenceImpl(RDF.TYPE),
@@ -548,7 +548,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -797,7 +797,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -842,7 +842,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -891,7 +891,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -1001,7 +1001,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new Variable("s"),
new URIReferenceImpl(RDF.TYPE),
@@ -1042,7 +1042,7 @@
Answer answer = session.query(new Query(
selectList, // SELECT
new ModelResource(systemModelURI), // FROM
- new ConstraintConjunction(Arrays.asList(new Constraint[]
+ new ConstraintConjunction(Arrays.asList(new ConstraintExpression[]
{
new ConstraintImpl(new URIReferenceImpl(new URI("http://www.conference.org/conf02004/paper#Paper3")),
new URIReferenceImpl(RDF.TYPE),
More information about the Mulgara-svn
mailing list