Commit 68eb49f9 authored by Bernd Kiefer's avatar Bernd Kiefer
Browse files

clean up dependencies

parent 822fb4a5
......@@ -115,12 +115,6 @@
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
......@@ -128,17 +122,11 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>net.sf.trove4j</groupId>
<artifactId>trove4j</artifactId>
......@@ -153,26 +141,4 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>FORSCHUNGSSOFTWARE</id>
<name>FORSCHUNGSSOFTWARE</name>
<url>http://www.forschungssoftware.de/nexus/content/groups/public/</url>
</repository>
</repositories>
<distributionManagement>
<snapshotRepository>
<id>FORSCHUNGSSOFTWARE</id>
<name>FORSCHUNGSSOFTWARE</name>
<url>http://www.forschungssoftware.de/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>FORSCHUNGSSOFTWARE</id>
<name>FORSCHUNGSSOFTWARE</name>
<url>http://www.forschungssoftware.de/nexus/content/repositories/releases/</url>
</repository>
</distributionManagement>
</project>
......@@ -7,7 +7,6 @@ import gnu.trove.set.hash.TCustomHashSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.log4j.Level;
import org.apache.log4j.LogMF;
import org.apache.log4j.Logger;
......@@ -48,7 +47,7 @@ public class IndexLookup {
QRelation r) {
this.tupleStore = tupleStore;
this.index = index;
this.clause = ArrayUtils.toPrimitive(clause.toArray(new Integer[clause.size()]));
this.clause = Utils.toPrimitive(clause);
this.indexedPosition = this.indexedPositionEnd = position;
this.relation = r;
}
......@@ -67,7 +66,7 @@ public class IndexLookup {
QRelation r) {
this.tupleStore = tupleStore;
this.index = index;
this.clause = ArrayUtils.toPrimitive(clause.toArray(new Integer[clause.size()]));
this.clause = Utils.toPrimitive(clause);
this.indexedPosition = position_start;
this.indexedPositionEnd = position_end;
this.relation = r;
......
......@@ -4,7 +4,6 @@ import java.util.*;
import de.dfki.lt.hfc.qrelations.QRelation;
import de.dfki.lt.hfc.qrelations.QRelationFactory;
import org.apache.commons.lang3.ArrayUtils;
......@@ -442,6 +441,7 @@ private boolean parseSelect(StringTokenizer st, HashSet<String> projectedVars)
aggregateClauses.add(aggregate);
}
/**
* maps surface WHERE form to internal representation. Further handles the internalization of
* relations and intervals, In case there are relations or intervals, two cases have to be
......@@ -536,7 +536,7 @@ private boolean parseSelect(StringTokenizer st, HashSet<String> projectedVars)
createPattern = tupleStore.indexStore.prepareLookup(clause, idToRelation, lkps,relationsToBeRewritten);
}
if (!activeIndex || !relationsToBeRewritten.isEmpty() || createPattern) {
patterns.add(ArrayUtils.toPrimitive(clause.toArray(new Integer[clause.size()])));
patterns.add(Utils.toPrimitive(clause));
}
}
for (QRelation relation : new HashSet<>(idToRelation.values())) {
......
package de.dfki.lt.hfc;
import java.util.List;
public class Utils {
public static int[] toPrimitive(List<Integer> l) {
int[] result = new int[l.size()];
for (int i = 0; i < result.length; ++i) result[i] = l.get(i);
return result;
}
}
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import static org.junit.Assert.*;
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.getTestResource;
import static de.dfki.lt.hfc.TestingUtils.getTestResource;
import static org.junit.Assert.*;
import java.io.FileNotFoundException;
......
......@@ -6,13 +6,13 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
public class BlankNodeOneTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("BlankNode1", name);
return TestingUtils.getTestResource("BlankNode1", name);
}
/**
......
......@@ -9,8 +9,8 @@ import org.junit.Test;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
......@@ -18,7 +18,7 @@ public class BlankNodeTwoTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("BlankNode2", name);
return TestingUtils.getTestResource("BlankNode2", name);
}
/**
......
......@@ -15,7 +15,7 @@ import org.junit.Test;
import gnu.trove.set.hash.*;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
public class CalcTest {
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.getTestResource;
import static de.dfki.lt.hfc.TestingUtils.getTestResource;
import static org.junit.Assert.*;
import java.io.FileNotFoundException;
......
......@@ -5,8 +5,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
......@@ -14,7 +14,7 @@ public class ConcatenateFourTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("Concatenate4", name);
return TestingUtils.getTestResource("Concatenate4", name);
}
@BeforeClass
public static void init() throws Exception {
......
......@@ -5,8 +5,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
......@@ -14,7 +14,7 @@ public class ConcatenateOneTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("Concatenate1", name);
return TestingUtils.getTestResource("Concatenate1", name);
}
@BeforeClass
public static void init() throws Exception {
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdString;
import static org.junit.Assert.*;
......
......@@ -5,8 +5,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
......@@ -14,7 +14,7 @@ public class ConcatenateThreeTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("Concatenate3", name);
return TestingUtils.getTestResource("Concatenate3", name);
}
@BeforeClass
public static void init() throws Exception {
......
......@@ -5,8 +5,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.Utils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
import static de.dfki.lt.hfc.TestingUtils.checkResult;
......@@ -14,7 +14,7 @@ public class ConcatenateTwoTest {
static ForwardChainer fc;
private static String getResource(String name) {
return Utils.getTestResource("Concatenate2", name);
return TestingUtils.getTestResource("Concatenate2", name);
}
@BeforeClass
public static void init() throws Exception {
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdDateTime;
import static org.junit.Assert.*;
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdDateTime;
import static org.junit.Assert.*;
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdDateTime;
import static org.junit.Assert.*;
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdDateTime;
import static org.junit.Assert.*;
......
package de.dfki.lt.hfc;
import static de.dfki.lt.hfc.Utils.*;
import static de.dfki.lt.hfc.TestingUtils.*;
import de.dfki.lt.hfc.types.XsdDateTime;
import static org.junit.Assert.*;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment