[Mulgara-svn] r1078 - trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql

[alexhall at mulgara.org]

Author: alexhall
Date: 2008-07-11 10:49:38 -0700 (Fri, 11 Jul 2008)
New Revision: 1078

Modified:
   trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/IdentityTransformer.java
   trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/VariableRenameTransformer.java
Log:
Remove Interval, Relational, and Test constraints from the variable renaming constraint transformation used for SPARQL DESCRIBE queries.  These depend on resolver classes that are not in the itql-version.jar file, and furthermore these constraints cannot be created by the parser but only by the query transformation code on the server.

Modified: trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/IdentityTransformer.java
===================================================================
--- trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/IdentityTransformer.java	2008-07-10 22:07:00 UTC (rev 1077)
+++ trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/IdentityTransformer.java	2008-07-11 17:49:38 UTC (rev 1078)
@@ -17,7 +17,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jrdf.graph.URIReference;
 import org.mulgara.query.Constraint;
 import org.mulgara.query.ConstraintConjunction;
 import org.mulgara.query.ConstraintDifference;
@@ -40,9 +39,6 @@
 import org.mulgara.query.SingleTransitiveConstraint;
 import org.mulgara.query.TransitiveConstraint;
 import org.mulgara.query.WalkConstraint;
-import org.mulgara.resolver.relational.RelationalConstraint;
-import org.mulgara.resolver.test.TestConstraint;
-import org.mulgara.resolver.xsd.IntervalConstraint;
 
 /**
  * Identity transformation on constraint expressions.
@@ -61,10 +57,10 @@
    * Builds a transformer, with identity constructors.
    */
   public IdentityTransformer() {
-    initialize(new ConsImpl(), new ConsInterval(), new ConsIs(), new ConsNegation(),
+    initialize(new ConsImpl(), new ConsIs(), new ConsNegation(),
          new ConsNotOccurs(), new ConsOccurs(), new ConsOccursLessThan(),
-         new ConsOccursMoreThan(), new ConsRelational(), new ConsSingleTransitive(),
-         new ConsTest(), new ConsTransitive(), new ConsWalk());
+         new ConsOccursMoreThan(), new ConsSingleTransitive(),
+         new ConsTransitive(), new ConsWalk());
   }
 
   /**
@@ -273,19 +269,6 @@
     public Class<ConstraintNegation> getType() { return ConstraintNegation.class; }
   }
 
-  protected class ConsInterval implements ConstraintTypeCons<IntervalConstraint> {
-    public IntervalConstraint newConstraint(Constraint c) {
-      IntervalConstraint i = (IntervalConstraint)c;
-      return i.mutateTo(i.getVariables().iterator().next(), (URIReference)i.getModel());
-    }
-    public Class<IntervalConstraint> getType() { return IntervalConstraint.class; }
-  }
-
-  protected class ConsRelational implements ConstraintTypeCons<RelationalConstraint> {
-    public RelationalConstraint newConstraint(Constraint c) { throw new UnsupportedOperationException("Cannot transform a relational constraint"); }
-    public Class<RelationalConstraint> getType() { return RelationalConstraint.class; }
-  }
-
   protected class ConsSingleTransitive implements ConstraintTypeCons<SingleTransitiveConstraint> {
     public SingleTransitiveConstraint newConstraint(Constraint c) throws SymbolicTransformationException {
       SingleTransitiveConstraint s = (SingleTransitiveConstraint)c;
@@ -294,14 +277,6 @@
     public Class<SingleTransitiveConstraint> getType() { return SingleTransitiveConstraint.class; }
   }
 
-  protected class ConsTest implements ConstraintTypeCons<TestConstraint> {
-    public TestConstraint newConstraint(Constraint c) {
-      TestConstraint t = (TestConstraint)c;
-      return new TestConstraint(t.getVariable1(), t.getVariable2(), t.getTestSelection(), t.getTestParam());
-    }
-    public Class<TestConstraint> getType() { return TestConstraint.class; }
-  }
-
   protected class ConsTransitive implements ConstraintTypeCons<TransitiveConstraint> {
     public TransitiveConstraint newConstraint(Constraint c) throws SymbolicTransformationException {
       TransitiveConstraint t = (TransitiveConstraint)c;

Modified: trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/VariableRenameTransformer.java
===================================================================
--- trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/VariableRenameTransformer.java	2008-07-10 22:07:00 UTC (rev 1077)
+++ trunk/src/jar/sparql-interpreter/java/org/mulgara/sparql/VariableRenameTransformer.java	2008-07-11 17:49:38 UTC (rev 1078)
@@ -13,7 +13,6 @@
 package org.mulgara.sparql;
 
 
-import org.jrdf.graph.URIReference;
 import org.mulgara.query.Constraint;
 import org.mulgara.query.ConstraintElement;
 import org.mulgara.query.ConstraintImpl;
@@ -23,8 +22,6 @@
 import org.mulgara.query.ConstraintOccursLessThan;
 import org.mulgara.query.ConstraintOccursMoreThan;
 import org.mulgara.query.Variable;
-import org.mulgara.resolver.test.TestConstraint;
-import org.mulgara.resolver.xsd.IntervalConstraint;
 
 /**
  * Transforms constraint expressions to rename variables.
@@ -50,7 +47,7 @@
   public VariableRenameTransformer(Variable from, Variable to) {
     this.from = from;
     this.to = to;
-    initialize(new CNO(), new CO(), new COLT(), new COMT(), new CI(), new CIs(), new CInt(), new CT());
+    initialize(new CNO(), new CO(), new COLT(), new COMT(), new CI(), new CIs());
   }
 
   // reimplement the individual construction code to replace variables
@@ -107,24 +104,4 @@
     }
   }
 
-  protected class CInt extends ConsInterval {
-    public IntervalConstraint newConstraint(Constraint c) {
-      IntervalConstraint i = (IntervalConstraint)c;
-      Variable v = i.getVariables().iterator().next();
-      if (v.equals(from)) v = to;
-      return i.mutateTo(v, (URIReference)i.getModel());
-    }
-  }
-
-  protected class CT extends ConsTest {
-    public TestConstraint newConstraint(Constraint c) {
-      TestConstraint t = (TestConstraint)c;
-      Variable v1 = t.getVariable1();
-      Variable v2 = t.getVariable2();
-      if (v1.equals(from)) v1 = to;
-      if (v2.equals(from)) v2 = to;
-      return new TestConstraint(v1, v2, t.getTestSelection(), t.getTestParam());
-    }
-  }
-
 }