Merge changes from r196. Removed an unused import and dependency

KMax · Jun 28, 2014 · 1e888f4 · 1e888f4 · KMax · Jun 28, 2014
1 parent e06579e
commit 1e888f4
Show file tree

Hide file tree

Showing 4 changed files with 231 additions and 192 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,11 +13,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.jena</groupId>
-            <artifactId>jena-arq</artifactId>
-            <version>2.9.3</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-tdb</artifactId>
@@ -26,18 +21,13 @@
         <dependency>
             <groupId>com.sleepycat</groupId>
             <artifactId>je</artifactId>
-            <version>5.0.73</version>
+            <version>4.1.10</version>
         </dependency>
         <dependency>
             <groupId>com.espertech</groupId>
             <artifactId>esper</artifactId>
             <version>4.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/main/java/org/deri/cqels/engine/CQELSEngine.java b/src/main/java/org/deri/cqels/engine/CQELSEngine.java
@@ -102,12 +102,12 @@ private String matchPattern(Quad quad) {
 
 	private EnQuad encode(Quad quad) {
 		return new EnQuad(encode(quad.getGraph()), encode(quad.getSubject()), 
-					      encode(quad.getSubject()), encode(quad.getObject()));
+					      encode(quad.getPredicate()), encode(quad.getObject()));
 	}
 
 	private EnQuad encode(Node graph,Triple triple) {
 		return new EnQuad(encode(graph), encode(triple.getSubject()), 
-				          encode(triple.getSubject()), encode(triple.getObject()));
+				          encode(triple.getPredicate()), encode(triple.getObject()));
 	}
 
 	public long encode(Node node) { 

diff --git a/src/main/java/org/deri/cqels/engine/IndexedTripleRouter.java b/src/main/java/org/deri/cqels/engine/IndexedTripleRouter.java
@@ -9,7 +9,6 @@
 import org.deri.cqels.data.Mapping;
 import org.deri.cqels.engine.iterator.MappingIterator;
 import org.deri.cqels.lang.cqels.OpStream;
-import org.hamcrest.core.IsInstanceOf;
 
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.sparql.algebra.op.OpTriple;