[Mulgara-svn] r460 - in branches/nw-interface: . src/jar/client-jrdf src/jar/itql src/jar/krule src/jar/query/java/org/mulgara/query src/jar/query/java/org/mulgara/query/rdf src/jar/resolver/java/org/mulgara/resolver src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem src/jar/resolver-gis/java/org/mulgara/resolver/gis src/jar/resolver-lucene/java/org/mulgara/resolver/lucene src/jar/resolver-memory/java/org/mulgara/resolver/memory src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype src/jar/resolver-prefix/java/org/mulgara/resolver/prefix src/jar/resolver-relational/java/org/mulgara/resolver/relational src/jar/resolver-spi/java/org/mulgara/resolver/spi src/jar/resolver-store/java/org/mulgara/resolver/store src/jar/resolver-test/java/org/mulgara/resolver/test src/jar/resolver-view/java/org/mulgara/resolver/view src/jar/sofa/java/org/mulgara/sofa/example src/jar/tuples/java/org/mulgara/store/tuples
pag at mulgara.org
pag at mulgara.org
Fri Sep 28 19:06:27 UTC 2007
Author: pag
Date: 2007-09-28 14:06:27 -0500 (Fri, 28 Sep 2007)
New Revision: 460
Modified:
branches/nw-interface/build.xml
branches/nw-interface/common.xml
branches/nw-interface/src/jar/client-jrdf/build.xml
branches/nw-interface/src/jar/itql/build.xml
branches/nw-interface/src/jar/krule/build.xml
branches/nw-interface/src/jar/query/java/org/mulgara/query/SpecialPredicates.java
branches/nw-interface/src/jar/query/java/org/mulgara/query/rdf/Mulgara.java
branches/nw-interface/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolverFactory.java
branches/nw-interface/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java
branches/nw-interface/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java
branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolution.java
branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java
branches/nw-interface/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java
branches/nw-interface/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java
branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverFactory.java
branches/nw-interface/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverFactoryInitializer.java
branches/nw-interface/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverFactory.java
branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverFactory.java
branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/Database.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseMetadataImpl.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswer.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswerUnitTest.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/TestDef.java
branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java
branches/nw-interface/src/jar/sofa/java/org/mulgara/sofa/example/CameraPhoneOntologyApp.java
branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java
Log:
Changed new URI to URI.create for hardcoded URIs.
Modified: branches/nw-interface/build.xml
===================================================================
--- branches/nw-interface/build.xml 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/build.xml 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,7 +28,6 @@
<property file="${jar.src.dir}/driver/driver-build.properties"/>
<property file="${jar.src.dir}/dtd/dtd-build.properties"/>
<property file="${jar.src.dir}/itql/itql-build.properties"/>
- <property file="${jar.src.dir}/parser/parser-build.properties"/>
<property file="${jar.src.dir}/jrdf/jrdf-build.properties"/>
<property file="${jar.src.dir}/query/query-build.properties"/>
<!--property file="${jar.src.dir}/rdql/rdql-build.properties"/-->
@@ -100,7 +99,6 @@
<import file="${jar.src.dir}/driver/build.xml"/>
<import file="${jar.src.dir}/dtd/build.xml"/>
<import file="${jar.src.dir}/itql/build.xml"/>
- <import file="${jar.src.dir}/parser/build.xml"/>
<import file="${jar.src.dir}/jrdf/build.xml"/>
<import file="${jar.src.dir}/query/build.xml"/>
<!--import file="${jar.src.dir}/rdql/build.xml"/-->
@@ -253,7 +251,7 @@
<!-- Run JUnit regression (non-load) tests on dbms.jar -->
<!-- =================================================================== -->
<target name="dbms-test" depends="-prepare-build, uri,
- driver-jar, itql-jar, parser-jar, query-jar, util-jar, log4j-conf.xml"
+ driver-jar, itql-jar, query-jar, util-jar, log4j-conf.xml"
description="runs regression tests on the triple store">
<!-- Set timestamp for CruiseControl's benefit -->
@@ -282,7 +280,6 @@
<classpath path="${bin.dir}/${query.jar}"/>
<classpath path="${bin.dir}/${driver.jar}"/>
<classpath path="${bin.dir}/${itql.jar}"/>
- <classpath path="${bin.dir}/${parser.jar}"/>
<classpath path="${bin.dir}/${rules.jar}"/>
<classpath path="${bin.dir}/${server.jar}"/>
<classpath path="${bin.dir}/${util.jar}"/>
@@ -474,7 +471,7 @@
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
<attribute name="Embedded-Jar" value="
- lib/${query.jar}, lib/${driver.jar}, lib/${itql.jar}, lib/${parser.jar}, lib/${rmi.jar},
+ lib/${query.jar}, lib/${driver.jar}, lib/${itql.jar}, lib/${rmi.jar},
lib/${server.jar}, lib/${server-beep.jar}, lib/${server-rmi.jar},
lib/${util.jar}, lib/${config.jar}, lib/${descriptor.jar}, lib/${server-local.jar},
lib/${resolver.jar}, lib/${resolver-spi.jar}, lib/${resolver-filesystem.jar},
@@ -505,7 +502,7 @@
<!-- Creates the lite distribution file for the Embedded Mulgara server -->
<!-- =================================================================== -->
<target name="lite-dist"
- depends="driver-jar, itql-jar, parser-jar, query-jar, rmi-jar,
+ depends="driver-jar, itql-jar, query-jar, rmi-jar,
server-jar, server-local-jar, server-beep-jar,
server-rmi-jar, util-jar, config-jar, dtd-jar, jrdf-jar, ant-task-jar,
store-dist, store-xa-dist, store-nodepool-dist,
@@ -559,7 +556,7 @@
${axis.jar}, ${commons-discovery.jar},
${jaxrpc.jar}, ${wsdl4j.jar}"/>
<zipfileset dir="${bin.dir}" prefix="lib" includes="
- ${query.jar}, ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
+ ${query.jar}, ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}, ${server-local.jar},
${resolver.jar}, ${resolver-spi.jar}, ${resolver-filesystem.jar},
@@ -733,7 +730,7 @@
ant-task-jar, client-jrdf-jar, config-jar,
connection-jar, content-mbox-jar, content-mp3-jar,
content-n3-jar, content-rdfxml-jar, content-rio-jar,
- doclet.jar, itql-jar, parser-jar, jrdf-jar, store-jar,
+ doclet.jar, itql-jar, jrdf-jar, store-jar,
store-xa-jar, connection-jar,
store-nodepool-jar, store-nodepool-memory-jar,
store-nodepool-xa-jar, query-jar,
@@ -1011,7 +1008,6 @@
<pathelement path="${bin.dir}/${query.jar}"/>
<pathelement path="${bin.dir}/${driver.jar}"/>
<pathelement path="${bin.dir}/${itql.jar}"/>
- <pathelement path="${bin.dir}/${parser.jar}"/>
<pathelement path="${bin.dir}/${rules.jar}"/>
<pathelement path="${bin.dir}/${server.jar}"/>
<pathelement path="${bin.dir}/${server-http.jar}"/>
@@ -1337,7 +1333,7 @@
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${query.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${rules.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
@@ -1403,7 +1399,7 @@
<lib dir="${lib.dir}" includes="log4j-core-*.jar, icu4j.jar, jena-*.jar, antlr*.jar, beepcore-*.jar,
lucene*.jar, apache-soap-*.jar, ${jrdf.jar}, ${date-utils.jar}, ${commons-logging.jar}"/>
<lib dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}"/>
<lib dir="${dist.dir}" includes="expires.txt"/>
@@ -1416,7 +1412,7 @@
targetfile="${bin.dir}/${mulgara.war}">
<srcfiles dir="${bin.dir}" includes="${query.jar},
- ${driver.jar}, ${itql.jar}, ${parser.jar}, ${rules.jar}, ${rmi.jar},
+ ${driver.jar}, ${itql.jar}, ${rules.jar}, ${rmi.jar},
${server.jar}, ${server-beep.jar}, ${server-rmi.jar},
${util.jar}, ${config.jar}, ${descriptor.jar}"/>
<srcfiles dir="${dist.dir}" includes="expires.txt"/>
@@ -1790,7 +1786,6 @@
<zipfileset src="${bin.dir}/${query.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${driver.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${itql.jar}" excludes="META-INF/**"/>
- <zipfileset src="${bin.dir}/${parser.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${rmi.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${server.jar}" excludes="META-INF/**"/>
<zipfileset src="${bin.dir}/${server-beep.jar}" excludes="META-INF/**"/>
@@ -1902,7 +1897,7 @@
<!--
<attribute name="Embedded-Jar" value="lib/${client-jrdf.jar}, lib/${client-jena.jar}, lib/${config.jar},
lib/${content-n3.jar}, lib/${content-rdfxml.jar}, lib/${content-rio.jar}, lib/${descriptor.jar},lib/${driver.jar},
-lib/${itql.jar}, lib/${parser.jar}, lib/${jrdf.base.jar}, lib${store-nodepool.jar},
+lib/${itql.jar}, lib/${jrdf.base.jar}, lib${store-nodepool.jar},
lib/${store-nodepool-memory.jar}, lib/${store-nodepool-xa.jar},lib/${query.jar}, lib/${resolver.jar},
lib/${resolver-file.jar}, lib/${resolver-filesystem.jar}, lib/${resolver-http.jar}, lib/${resolver-memory.jar},
lib/${resolver-nodetype.jar}, lib/${resolver-prefix.jar}, lib/${resolver-spi.jar}, lib/${resolver-store.jar}, lib/${resolver-jar.jar},
Modified: branches/nw-interface/common.xml
===================================================================
--- branches/nw-interface/common.xml 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/common.xml 2007-09-28 19:06:27 UTC (rev 460)
@@ -352,7 +352,7 @@
<path refid="query-classpath"/>
- <fileset dir="${bin.dir}" includes="${dtd.jar}, ${parser.jar}, ${itql.jar}, ${query.jar},
+ <fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar}, ${query.jar},
${driver.jar}, ${rmi.jar}, ${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar, jxunit*.jar, junit.jar, junitpp.jar"/>
</classpath>
@@ -412,7 +412,7 @@
<path refid="query-classpath"/>
<fileset dir="${bin.dir}" includes="${dtd.jar}, ${itql.jar},
- ${query.jar}, ${parser.jar},
+ ${query.jar},
${driver.jar}, ${rmi.base.jar},
${server-rmi.jar}"/>
<fileset dir="${lib.dir}" includes="xerces*.jar, xmlParserAPIs.jar,
Modified: branches/nw-interface/src/jar/client-jrdf/build.xml
===================================================================
--- branches/nw-interface/src/jar/client-jrdf/build.xml 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/client-jrdf/build.xml 2007-09-28 19:06:27 UTC (rev 460)
@@ -27,7 +27,6 @@
<pathelement path="${jrdf.dist.dir}/${jrdf.base.jar}"/>
<pathelement path="${server-rmi.dist.dir}/${server-rmi.jar}"/>
<pathelement path="${itql.dist.dir}/${itql.jar}"/>
- <pathelement path="${parser.dist.dir}/${parser.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
<pathelement path="${lib.dir}/${jrdf.jar}"/>
</path>
@@ -61,7 +60,7 @@
</target>
<target name="client-jrdf-compile"
- depends="-client-jrdf-prepare, driver-jar, itql-jar, parser-jar, server-jar, jrdf-jar"
+ depends="-client-jrdf-prepare, driver-jar, itql-jar, server-jar, jrdf-jar"
description="Compiles all client-jrdf related files included generated
source code">
Modified: branches/nw-interface/src/jar/itql/build.xml
===================================================================
--- branches/nw-interface/src/jar/itql/build.xml 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/itql/build.xml 2007-09-28 19:06:27 UTC (rev 460)
@@ -23,7 +23,6 @@
<fileset file="${driver.dist.dir}/${driver.jar}"/>
<fileset file="${util.dist.dir}/${util.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
- <fileset file="${parser.dist.dir}/${parser.jar}"/>
</path>
<path id="itql-test-classpath">
<path refid="itql-classpath"/>
@@ -32,7 +31,6 @@
<fileset file="${bin.dir}/${rmi.jar}"/>
<fileset file="${itql.dist.dir}/${itql.jar}"/>
<fileset file="${rules.dist.dir}/${rules.jar}"/>
- <fileset file="${parser.dist.dir}/${parser.jar}"/>
</path>
<target name="itql-clean" description="Removes all compile generated files for the itql">
@@ -72,7 +70,7 @@
</uptodate>
</target>
- <target name="itql-compile" depends="-itql-prepare, gen-itql-parser, driver-jar, parser-jar" description="Compiles all itql related files included generated source code">
+ <target name="itql-compile" depends="-itql-prepare, gen-itql-parser, driver-jar" description="Compiles all itql related files included generated source code">
<copy todir="${itql.obj.dir}/java/" preservelastmodified="yes">
<fileset dir="${itql.src.dir}/java/" includes="**/*.java"/>
</copy>
@@ -89,7 +87,7 @@
</manifest>
<manifest file="${obj.dir}/META-INF/MANIFEST_ITQL_BOOTSTRAP.MF">
<attribute name="Main-Class" value="org.mulgara.util.Bootstrap"/>
- <attribute name="Embedded-Jar" value="${query.jar}, ${parser.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.8.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
+ <attribute name="Embedded-Jar" value="${query.jar}, ${driver.jar}, ${itql.jar},${util.jar}, ${server-beep.jar}, ${server-rmi.jar}, apache-soap-2.2.jar, log4j-1.2.8.jar,jargs-0.2.jar, ${jrdf.jar}, ${saaj.jar}, ${emory-util.jar}"/>
<attribute name="Embedded-Main-Class" value="org.mulgara.itql.ItqlSession"/>
</manifest>
</target>
@@ -130,7 +128,6 @@
<zipfileset src="${driver.dist.dir}/${driver.jar}" excludes="META-INF/**"/>
<zipfileset src="${itql.dist.dir}/${itql.jar}" excludes="META-INF/**"/>
<zipfileset src="${query.dist.dir}/${query.jar}" excludes="META-INF/**"/>
- <zipfileset src="${parser.dist.dir}/${parser.jar}" excludes="META-INF/**"/>
<zipfileset src="${server-beep.dist.dir}/${server-beep.jar}" excludes="META-INF/**"/>
<zipfileset src="${server-rmi.dist.dir}/${server-rmi.jar}" excludes="META-INF/**"/>
<zipfileset src="${util.dist.dir}/${util.jar}" excludes="META-INF/**"/>
@@ -157,7 +154,6 @@
<srcfiles dir="${itql.dist.dir}" includes="${itql.jar}"/>
<srcfiles dir="${driver.dist.dir}" includes="${driver.jar}"/>
<srcfiles dir="${query.dist.dir}" includes="${query.jar}"/>
- <srcfiles dir="${parser.dist.dir}" includes="${parser.jar}"/>
<srcfiles dir="${server-beep.dist.dir}" includes="${server-beep.jar}"/>
<srcfiles dir="${server-rmi.dist.dir}" includes="${server-rmi.jar}"/>
<srcfiles dir="${util.dist.dir}" includes="${util.jar}"/>
Modified: branches/nw-interface/src/jar/krule/build.xml
===================================================================
--- branches/nw-interface/src/jar/krule/build.xml 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/krule/build.xml 2007-09-28 19:06:27 UTC (rev 460)
@@ -25,7 +25,6 @@
<pathelement path="${driver.dist.dir}/${driver.jar}"/>
<pathelement path="${util.dist.dir}/${util.jar}"/>
<pathelement path="${itql.dist.dir}/${itql.jar}"/>
- <pathelement path="${parser.dist.dir}/${parser.jar}"/>
<pathelement path="${tuples.dist.dir}/${tuples.jar}"/>
<pathelement path="${rules.dist.dir}/${rules.jar}"/>
</path>
@@ -58,7 +57,7 @@
</target>
<target name="krule-compile"
- depends="-krule-prepare, driver-jar, itql-jar, parser-jar, rules-jar, tuples-jar"
+ depends="-krule-prepare, driver-jar, itql-jar, rules-jar, tuples-jar"
description="Compiles all krule related files included generated source code">
<javac destdir="${krule.obj.dir}/classes" debug="on"
Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/SpecialPredicates.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/SpecialPredicates.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/SpecialPredicates.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -29,14 +29,13 @@
// java packages
import java.net.URI;
-import java.net.URISyntaxException;
+import java.util.Set;
// external packages
-import org.jrdf.graph.URIReference;
import org.jrdf.vocabulary.Vocabulary;
// local packages
-import org.mulgara.query.rdf.Mulgara;
+import static org.mulgara.query.rdf.Mulgara.NAMESPACE;
/**
* Provides a central point for defining all magic predicates used by Mulgara.
@@ -57,22 +56,23 @@
*
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
+ at SuppressWarnings({ "serial", "unchecked" })
public class SpecialPredicates extends Vocabulary {
/** The string for the equality predicate */
- public static final String IS = Mulgara.NAMESPACE + "is";
+ public static final String IS = NAMESPACE + "is";
/** The string for the cardinality equality predicate */
- public static final String OCCURS = Mulgara.NAMESPACE + "occurs";
+ public static final String OCCURS = NAMESPACE + "occurs";
/** The string for the cardinality equality predicate */
- public static final String NOT_OCCURS = Mulgara.NAMESPACE + "notOccurs";
+ public static final String NOT_OCCURS = NAMESPACE + "notOccurs";
/** The string for the cardinality less than predicate */
- public static final String OCCURS_LESS_THAN = Mulgara.NAMESPACE + "occursLessThan";
+ public static final String OCCURS_LESS_THAN = NAMESPACE + "occursLessThan";
/** The string for the cardinality greater than predicate */
- public static final String OCCURS_MORE_THAN = Mulgara.NAMESPACE + "occursMoreThan";
+ public static final String OCCURS_MORE_THAN = NAMESPACE + "occursMoreThan";
/** The URI for the equality predicate */
public static final URI MULGARA_IS;
@@ -91,22 +91,17 @@
// intialize all predicate URIs
static {
- try {
- MULGARA_IS = new URI(IS);
- MULGARA_OCCURS = new URI(OCCURS);
- MULGARA_NOT_OCCURS = new URI(NOT_OCCURS);
- MULGARA_OCCURS_LESS_THAN = new URI(OCCURS_LESS_THAN);
- MULGARA_OCCURS_MORE_THAN = new URI(OCCURS_MORE_THAN);
+ MULGARA_IS = URI.create(IS);
+ MULGARA_OCCURS = URI.create(OCCURS);
+ MULGARA_NOT_OCCURS = URI.create(NOT_OCCURS);
+ MULGARA_OCCURS_LESS_THAN = URI.create(OCCURS_LESS_THAN);
+ MULGARA_OCCURS_MORE_THAN = URI.create(OCCURS_MORE_THAN);
- resources.add(MULGARA_IS);
- resources.add(MULGARA_OCCURS);
- resources.add(MULGARA_NOT_OCCURS);
- resources.add(MULGARA_OCCURS_LESS_THAN);
- resources.add(MULGARA_OCCURS_MORE_THAN);
- } catch (URISyntaxException e) {
- // Houston, we have a problem. Not much we can do with it, so rethrow as an error.
- throw new ExceptionInInitializerError(e);
- }
+ ((Set<URI>)resources).add(MULGARA_IS);
+ ((Set<URI>)resources).add(MULGARA_OCCURS);
+ ((Set<URI>)resources).add(MULGARA_NOT_OCCURS);
+ ((Set<URI>)resources).add(MULGARA_OCCURS_LESS_THAN);
+ ((Set<URI>)resources).add(MULGARA_OCCURS_MORE_THAN);
}
Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/rdf/Mulgara.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/rdf/Mulgara.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/rdf/Mulgara.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -39,11 +39,7 @@
* <a href="http://www.pisoftware.com/">Plugged In Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface Mulgara {
- // FIXME: THis should not be an interface.
-
- /**
- * Mulgara RDF namespace.
- */
+public class Mulgara {
+ /** Mulgara RDF namespace. */
public final static String NAMESPACE = "http://mulgara.org/mulgara#";
}
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -68,40 +68,23 @@
private static Logger logger =
Logger.getLogger(AdvDatabaseSessionUnitTest.class.getName());
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
- private static final URI modelURI;
- private static final URI model2URI;
- private static final URI model3URI;
- private static final URI model4URI;
- private static final URI model5URI;
+ private static final URI modelURI = URI.create("local:database#model");
+ private static final URI model2URI = URI.create("local:database#model2");
+ private static final URI model3URI = URI.create("local:database#model3");
+ private static final URI model4URI = URI.create("local:database#model4");
+ private static final URI model5URI = URI.create("local:database#model5");
- private static final URI xsdModelTypeURI;
+ private static final URI xsdModelTypeURI = URI.create(Mulgara.NAMESPACE + "XMLSchemaModel");
- static {
- try {
- databaseURI = new URI("local:database");
- modelURI = new URI("local:database#model");
- model2URI = new URI("local:database#model2");
- model3URI = new URI("local:database#model3");
- model4URI = new URI("local:database#model4");
- model5URI = new URI("local:database#model5");
-
- xsdModelTypeURI = new URI(Mulgara.NAMESPACE + "XMLSchemaModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
private static Database database = null;
- public AdvDatabaseSessionUnitTest(String name)
- {
+ public AdvDatabaseSessionUnitTest(String name) {
super(name);
}
- public static Test suite()
- {
+ public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new AdvDatabaseSessionUnitTest("testSetModel"));
suite.addTest(new AdvDatabaseSessionUnitTest("testBasicQuery"));
@@ -196,8 +179,7 @@
/**
* The teardown method for JUnit
*/
- public void tearDown()
- {
+ public void tearDown() {
}
//
@@ -207,8 +189,7 @@
/**
* Test the {@link DatabaseSession#setModel} method.
*/
- public void testSetModel() throws URISyntaxException
- {
+ public void testSetModel() throws URISyntaxException {
logger.info("testSetModel");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -666,8 +647,7 @@
}
- public void testExplicitIsolationQuery() throws URISyntaxException
- {
+ public void testExplicitIsolationQuery() throws URISyntaxException {
logger.info("testExplicitIsolationQuery");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -764,8 +744,7 @@
}
}
- public void testExplicitRollbackIsolationQuery() throws URISyntaxException
- {
+ public void testExplicitRollbackIsolationQuery() throws URISyntaxException {
logger.info("testExplicitRollbackIsolationQuery");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -849,8 +828,7 @@
}
- public void testExplicitCommitIsolationQuery() throws URISyntaxException
- {
+ public void testExplicitCommitIsolationQuery() throws URISyntaxException {
logger.info("testExplicitCommitIsolationQuery");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -1017,8 +995,7 @@
}
- public void testImplicitCommitQuery() throws URISyntaxException
- {
+ public void testImplicitCommitQuery() throws URISyntaxException {
logger.info("testImplicitCommitQuery");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -1124,8 +1101,7 @@
* Test two simultaneous, explicit transactions, in two threads. The second one should block
* until the first one sets auto-commit back to true.
*/
- public void testConcurrentExplicitTxn() throws URISyntaxException
- {
+ public void testConcurrentExplicitTxn() throws URISyntaxException {
logger.info("testConcurrentExplicitTxn");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -1256,8 +1232,7 @@
* Test two simultaneous transactions, the first one explicit and the second one in auto-commit,
* in two threads. The second one should proceed but not see uncommitted data.
*/
- public void testConcurrentImplicitTxn() throws URISyntaxException
- {
+ public void testConcurrentImplicitTxn() throws URISyntaxException {
logger.info("testConcurrentImplicitTxn");
URI fileURI = new File("data/xatest-model1.rdf").toURI();
@@ -1403,8 +1378,7 @@
}
- public void testPrefixingWithUnbound() throws URISyntaxException
- {
+ public void testPrefixingWithUnbound() throws URISyntaxException {
logger.warn("testPrefixingWithUnbound");
URI fileURI = new File("data/prefix-unbound.rdf").toURI();
@@ -1524,8 +1498,7 @@
assertFalse(answer2.next());
}
- public void testCreateModel() throws URISyntaxException
- {
+ public void testCreateModel() throws URISyntaxException {
logger.info("testCreateModel");
try {
@@ -1552,8 +1525,7 @@
/**
* Fail with an unexpected exception
*/
- private void fail(Throwable throwable)
- {
+ private void fail(Throwable throwable) {
StringWriter stringWriter = new StringWriter();
throwable.printStackTrace(new PrintWriter(stringWriter));
fail(stringWriter.toString());
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/BasicDatabaseSessionUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -45,9 +45,6 @@
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.server.Session;
-import org.mulgara.store.StoreException;
-import org.mulgara.store.nodepool.NodePool;
-import org.mulgara.store.stringpool.StringPool;
import org.mulgara.util.FileUtil;
/**
@@ -65,27 +62,17 @@
public class BasicDatabaseSessionUnitTest extends TestCase
{
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
/**
* The URI of the {@link #database}'s system model:
* <code>local:database#</code>.
*/
- private static final URI systemModelURI;
+ private static final URI systemModelURI = URI.create("local:database#");
/** The URI of the {@link #database}'s system model type. */
- private static final URI memoryModelURI;
+ private static final URI memoryModelURI = URI.create(Mulgara.NAMESPACE+"MemoryModel");
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- memoryModelURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
/** Logger. */
private static Logger logger =
Logger.getLogger(BasicDatabaseSessionUnitTest.class.getName());
@@ -103,8 +90,7 @@
*
* @param name the test name
*/
- public BasicDatabaseSessionUnitTest(String name)
- {
+ public BasicDatabaseSessionUnitTest(String name) {
super(name);
}
@@ -114,8 +100,7 @@
*
* @return the test suite
*/
- public static Test suite()
- {
+ public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new BasicDatabaseSessionUnitTest("testQuery1"));
suite.addTest(new BasicDatabaseSessionUnitTest("testSetModel"));
@@ -127,8 +112,7 @@
/**
* Create test objects.
*/
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
// Create the persistence directory
File persistenceDirectory =
new File(new File(System.getProperty("cvs.root")), "testDatabase");
@@ -181,8 +165,7 @@
/**
* The teardown method for JUnit
*/
- public void tearDown()
- {
+ public void tearDown() {
database.delete();
}
@@ -204,7 +187,7 @@
Variable predicateVariable = new Variable("predicate");
Variable objectVariable = new Variable("object");
- List selectList = new ArrayList(3);
+ List<Object> selectList = new ArrayList<Object>(3);
selectList.add(subjectVariable);
selectList.add(predicateVariable);
selectList.add(objectVariable);
@@ -249,8 +232,7 @@
/**
* Test the {@link DatabaseSession#setModel} method.
*/
- public void testSetModel() throws URISyntaxException
- {
+ public void testSetModel() throws URISyntaxException {
logger.info("testSetModel");
URI fileURI = new File("data/dc.rdfs").toURI();
URI modelURI = new URI("local:database#model");
@@ -294,13 +276,13 @@
Variable predicateVariable = new Variable("predicate");
Variable objectVariable = new Variable("object");
- List selectList = new ArrayList(3);
+ List<Object> selectList = new ArrayList<Object>(3);
selectList.add(subjectVariable);
selectList.add(predicateVariable);
selectList.add(objectVariable);
// Evaluate the query
- Answer answer = new ArrayAnswer(session.query(new Query(
+ new ArrayAnswer(session.query(new Query(
selectList, // SELECT
new ModelUnion(new ModelResource(dcFileURI), // FROM
new ModelResource(rdfsFileURI)),
@@ -331,8 +313,7 @@
/**
* Fail with an unexpected exception
*/
- private void fail(Throwable throwable)
- {
+ private void fail(Throwable throwable) {
StringWriter stringWriter = new StringWriter();
throwable.printStackTrace(new PrintWriter(stringWriter));
fail(stringWriter.toString());
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/Database.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/Database.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/Database.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -108,8 +108,7 @@
Logger.getLogger(Database.class.getName());
/** Startup Logger - will always have info enabled */
- private static final Logger startupLogger =
- Logger.getLogger("Startup");
+ private static final Logger startupLogger = Logger.getLogger("Startup");
/**
* Placeholder indicating a nonexistent local node.
@@ -625,8 +624,7 @@
.iterator()
.next()).getKey();
*/
- temporaryModelTypeURI = new URI(Mulgara.NAMESPACE + "MemoryModel");
- assert temporaryModelTypeURI != null;
+ temporaryModelTypeURI = URI.create(Mulgara.NAMESPACE + "MemoryModel");
/*
// Discard any temporary resolver state
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseMetadataImpl.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseMetadataImpl.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseMetadataImpl.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -29,11 +29,10 @@
// Java 2 standard packages
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Set;
// Local packages
-import org.mulgara.query.rdf.Mulgara;
+import static org.mulgara.query.rdf.Mulgara.NAMESPACE;
import org.mulgara.resolver.spi.DatabaseMetadata;
/**
@@ -49,21 +48,10 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-
-public class DatabaseMetadataImpl implements DatabaseMetadata
-{
- private static final URI PREALLOCATED_SUBJECT_URI;
- private static final URI PREALLOCATED_PREDICATE_URI;
- private static final URI PREALLOCATED_MODEL_URI;
- static {
- try {
- PREALLOCATED_SUBJECT_URI = new URI(Mulgara.NAMESPACE + "preallocatedNodes");
- PREALLOCATED_PREDICATE_URI = new URI(Mulgara.NAMESPACE + "preallocatedNode");
- PREALLOCATED_MODEL_URI = new URI(Mulgara.NAMESPACE + "preallocatedNodeModel");
- } catch (URISyntaxException eu) {
- throw new Error("Invalid URI Syntax", eu);
- }
- }
+public class DatabaseMetadataImpl implements DatabaseMetadata {
+ private static final URI PREALLOCATED_SUBJECT_URI = URI.create(NAMESPACE + "preallocatedNodes");
+ private static final URI PREALLOCATED_PREDICATE_URI = URI.create(NAMESPACE + "preallocatedNode");
+ private static final URI PREALLOCATED_MODEL_URI = URI.create(NAMESPACE + "preallocatedNodeModel");
private long preallocatedSubjectNode = -1;
private long preallocatedPredicateNode = -1;
private long preallocatedModelNode = -1;
@@ -75,7 +63,7 @@
private URI systemModelTypeURI;
/** The set of alternative hostnames for the current host. */
- private final Set hostnameAliases;
+ private final Set<String> hostnameAliases;
private long systemModelNode = -1;
private long systemModelTypeNode = -1;
@@ -83,8 +71,7 @@
private String serverName;
- DatabaseMetadataImpl(URI uri, Set hostnameAliases, URI securityDomainURI, URI systemModelURI, URI rdfTypeURI, URI systemModelTypeURI)
- {
+ DatabaseMetadataImpl(URI uri, Set<String> hostnameAliases, URI securityDomainURI, URI systemModelURI, URI rdfTypeURI, URI systemModelTypeURI) {
// Validate parameters.
if (uri == null) {
throw new IllegalArgumentException("uri null");
@@ -114,37 +101,32 @@
}
- public URI getURI()
- {
+ public URI getURI() {
return uri;
}
- public URI getSecurityDomainURI()
- {
+ public URI getSecurityDomainURI() {
return securityDomainURI;
}
- public URI getSystemModelURI()
- {
+ public URI getSystemModelURI() {
return systemModelURI;
}
- public URI getSystemModelTypeURI()
- {
+ public URI getSystemModelTypeURI() {
return systemModelTypeURI;
}
- public URI getRdfTypeURI()
- {
+ public URI getRdfTypeURI() {
return rdfTypeURI;
}
- public Set getHostnameAliases() {
+ public Set<String> getHostnameAliases() {
return hostnameAliases;
}
@@ -159,8 +141,7 @@
return serverName;
}
- public long getSystemModelNode()
- {
+ public long getSystemModelNode() {
if (systemModelNode == -1) {
throw new IllegalStateException("Requesting systemModelNode before initialisation");
}
@@ -169,8 +150,7 @@
}
- public long getSystemModelTypeNode()
- {
+ public long getSystemModelTypeNode() {
if (systemModelTypeNode == -1) {
throw new IllegalStateException("Requesting systemModelTypeNode before initialisation");
}
@@ -179,8 +159,7 @@
}
- public long getRdfTypeNode()
- {
+ public long getRdfTypeNode() {
if (rdfTypeNode == -1) {
throw new IllegalStateException("Requesting rdfTypeNode before initialisation");
}
@@ -190,26 +169,22 @@
- public URI getPreallocationSubjectURI()
- {
+ public URI getPreallocationSubjectURI() {
return PREALLOCATED_SUBJECT_URI;
}
- public URI getPreallocationPredicateURI()
- {
+ public URI getPreallocationPredicateURI() {
return PREALLOCATED_PREDICATE_URI;
}
- public URI getPreallocationModelURI()
- {
+ public URI getPreallocationModelURI() {
return PREALLOCATED_MODEL_URI;
}
- public long getPreallocationSubjectNode()
- {
+ public long getPreallocationSubjectNode() {
if (preallocatedSubjectNode == -1) {
throw new IllegalStateException("Requesting preallocatedSubjectNode before initialisation");
}
@@ -218,8 +193,7 @@
}
- public long getPreallocationPredicateNode()
- {
+ public long getPreallocationPredicateNode() {
if (preallocatedPredicateNode == -1) {
throw new IllegalStateException("Requesting preallocatedPredicateNode before initialisation");
}
@@ -228,8 +202,7 @@
}
- public long getPreallocationModelNode()
- {
+ public long getPreallocationModelNode() {
if (preallocatedModelNode == -1) {
throw new IllegalStateException("Requesting preallocatedModelNode before initialisation");
}
@@ -238,8 +211,7 @@
}
- public void initializeSystemNodes(long systemModelNode, long rdfTypeNode, long systemModelTypeNode)
- {
+ public void initializeSystemNodes(long systemModelNode, long rdfTypeNode, long systemModelTypeNode) {
if (systemModelNode < 0) {
throw new IllegalArgumentException("Attempting to set invalid systemModelNode");
}
@@ -265,8 +237,7 @@
}
- public void initializePreallocationNodes(long preallocatedSubjectNode, long preallocatedPredicateNode, long preallocatedModelNode)
- {
+ public void initializePreallocationNodes(long preallocatedSubjectNode, long preallocatedPredicateNode, long preallocatedModelNode) {
if (preallocatedSubjectNode < 0) {
throw new IllegalArgumentException("Attempting to set invalid preallocatedSubjectNode");
}
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionListQueryUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -30,7 +30,6 @@
// Java 2 standard packages
import java.io.File;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.*;
// Third party packages
@@ -64,10 +63,10 @@
*/
public class DatabaseSessionListQueryUnitTest extends TestCase {
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
/** The URI of the {@link #database}'s system model type. */
- private static final URI memoryModelURI;
+ private static final URI memoryModelURI = URI.create(Mulgara.NAMESPACE + "MemoryModel");
/** A list of model URIs that can be queried.
* local:database#model0 -> local:database#modelNUM_MODELS
@@ -81,24 +80,15 @@
private static final int NUM_STATEMENTS = 20;
static {
- try {
- databaseURI = new URI("local:database");
- memoryModelURI = new URI(Mulgara.NAMESPACE + "MemoryModel");
-
- //generate a number of models to be 'batch' queried
- modelURIs = new ArrayList<URI>();
- for (int i = 0; i < NUM_MODELS; i++) {
- modelURIs.add(new URI("local:database#model" + i));
- }
+ //generate a number of models to be 'batch' queried
+ modelURIs = new ArrayList<URI>();
+ for (int i = 0; i < NUM_MODELS; i++) {
+ modelURIs.add(URI.create("local:database#model" + i));
}
- catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
}
/** Logger. */
- private static Logger logger =
- Logger.getLogger(DatabaseSessionListQueryUnitTest.class.getName());
+ private static Logger logger = Logger.getLogger(DatabaseSessionListQueryUnitTest.class.getName());
/**
* In-memory test {@link Database} used to generate {@link DatabaseSession}s
@@ -333,7 +323,7 @@
URIReference object = new URIReferenceImpl(new URI(RDFS.baseURI + "Class"));
for (int i = 0; i < NUM_STATEMENTS; i++) {
- subject = new URIReferenceImpl(new URI(Mulgara.NAMESPACE + "subject" + i));
+ subject = new URIReferenceImpl(URI.create(Mulgara.NAMESPACE + "subject" + i));
statements.add(new TripleImpl(subject, predicate, object));
}
@@ -348,7 +338,6 @@
* @throws Exception
*/
private void createModel(URI modelURI, Session session) throws Exception {
-
// session.createModel(modelURI, new URI(Mulgara.NAMESPACE + "Model"));
session.createModel(modelURI, memoryModelURI);
}
@@ -361,7 +350,6 @@
* @throws Exception
*/
private void dropModel(URI modelURI, Session session) throws Exception {
-
session.removeModel(modelURI);
}
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/DatabaseSessionUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -38,16 +38,12 @@
// Third party packages
import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
-import org.jrdf.vocabulary.RDF; // JRDF
// Locally written packages
import org.mulgara.query.*;
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.server.Session;
-import org.mulgara.store.StoreException;
-import org.mulgara.store.nodepool.NodePool;
-import org.mulgara.store.stringpool.StringPool;
import org.mulgara.util.FileUtil;
/**
@@ -64,27 +60,19 @@
*/
public class DatabaseSessionUnitTest extends TestCase {
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
/**
* The URI of the {@link #database}'s system model:
* <code>local:database#</code>.
*/
- private static final URI systemModelURI;
+ @SuppressWarnings("unused")
+ private static final URI systemModelURI = URI.create("local:database#");
/** The URI of the {@link #database}'s system model type. */
- private static final URI memoryModelURI;
+ @SuppressWarnings("unused")
+ private static final URI memoryModelURI = URI.create(Mulgara.NAMESPACE+"MemoryModel");
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- memoryModelURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
/** Logger. */
private static Logger logger =
Logger.getLogger(DatabaseSessionUnitTest.class.getName());
@@ -559,20 +547,18 @@
// Test cases
//
+ @SuppressWarnings("unchecked")
public void testModel() {
try {
logger.debug("Testing: " + test.errorString);
Session session = database.newSession();
try {
- List orderList = new ArrayList();
- Iterator i = test.selectList.iterator();
- while (i.hasNext()) {
- orderList.add(new Order((Variable)i.next(), true));
- }
+ List<Order> orderList = new ArrayList<Order>();
+ for (Variable v: test.selectList) orderList.add(new Order(v, true));
// Evaluate the query
Answer answer = new ArrayAnswer(session.query(new Query(
- test.selectList, // SELECT
+ (List<Object>)(List)test.selectList, // SELECT
test.model, // FROM
test.query, // WHERE
null, // HAVING
@@ -584,7 +570,7 @@
logger.debug("Results Expected in " + test.errorString + " = " + test.results);
logger.debug("Results Received in " + test.errorString + " = " + answer);
- i = test.results.iterator();
+ Iterator<List<Object>> i = test.results.iterator();
answer.beforeFirst();
while (true) {
boolean hasAnswer = answer.next();
@@ -593,10 +579,9 @@
break;
}
assertTrue(test.errorString, hasAnswer && hasResult);
- Iterator j = ((List)i.next()).iterator();
int c = 0;
- while (j.hasNext()) {
- assertEquals(test.errorString, j.next().toString(), answer.getObject(c++).toString());
+ for (Object obj: i.next()) {
+ assertEquals(test.errorString, obj.toString(), answer.getObject(c++).toString());
}
}
} finally {
@@ -614,6 +599,7 @@
/**
* Fail with an unexpected exception
*/
+ @SuppressWarnings("unused")
private void fail(Throwable throwable) {
fail(null, throwable);
}
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswer.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswer.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswer.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -83,18 +83,8 @@
*
* This ought to be replaced by owl:sameIndividualAs.
*/
- static final URIReferenceImpl MULGARA_IS;
+ static final URIReferenceImpl MULGARA_IS = new URIReferenceImpl(URI.create(Mulgara.NAMESPACE+"is"));
- // Initialize global constants
- static {
- try {
- MULGARA_IS = new URIReferenceImpl(new URI(Mulgara.NAMESPACE+"is"));
- }
- catch (URISyntaxException e) {
- throw new ExceptionInInitializerError(e);
- }
- }
-
//
// Constructor
//
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswerUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswerUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/SubqueryAnswerUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,9 +28,6 @@
package org.mulgara.resolver;
// Java 2 standard packages
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
@@ -38,7 +35,6 @@
// Third party packages
import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
-import org.jrdf.vocabulary.RDF; // JRDF
// Locally written packages
import org.mulgara.query.*;
@@ -71,35 +67,28 @@
/**
* Logger.
*/
- private static Logger logger =
- Logger.getLogger(SubqueryAnswerUnitTest.class.getName());
+ @SuppressWarnings("unused")
+ private static Logger logger = Logger.getLogger(SubqueryAnswerUnitTest.class.getName());
/**
* The URI of the {@link #database}: <code>local:database</code>.
*/
- private static final URI databaseURI;
+ @SuppressWarnings("unused")
+ private static final URI databaseURI = URI.create("local:database");
/**
* The URI of the {@link #database}'s system model:
* <code>local:database#</code>.
*/
- private static final URI systemModelURI;
+ @SuppressWarnings("unused")
+ private static final URI systemModelURI = URI.create("local:database#");
/**
* The URI of the {@link #database}'s system model type.
*/
- private static final URI memoryModelURI;
+ @SuppressWarnings("unused")
+ private static final URI memoryModelURI = URI.create(Mulgara.NAMESPACE+"MemoryModel");
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- memoryModelURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
/**
* In-memory test {@link Database} used to generate {@link DatabaseSession}s
* for testing.
@@ -171,7 +160,7 @@
new Variable[] { varX, varY, varZ } );
// Create variable list with differing order.
- ArrayList variableList = new ArrayList();
+ ArrayList<Variable> variableList = new ArrayList<Variable>();
variableList.add(varX);
variableList.add(varZ);
variableList.add(varY);
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/TestDef.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/TestDef.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/TestDef.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,27 +28,13 @@
package org.mulgara.resolver;
// Java 2 standard packages
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.*;
// Third party packages
-import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
-import org.jrdf.vocabulary.RDF; // JRDF
// Locally written packages
import org.mulgara.query.*;
-import org.mulgara.query.rdf.Mulgara;
-import org.mulgara.query.rdf.URIReferenceImpl;
-import org.mulgara.server.Session;
-import org.mulgara.store.StoreException;
-import org.mulgara.store.nodepool.NodePool;
-import org.mulgara.store.stringpool.StringPool;
-import org.mulgara.util.FileUtil;
/**
* Test case for {@link DatabaseSession}.
@@ -62,23 +48,21 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-
public class TestDef {
/** Logger. */
- private static Logger logger =
- Logger.getLogger(TestDef.class.getName());
+ private static Logger logger = Logger.getLogger(TestDef.class.getName());
public String name;
public String[] resolvers;
- public List selectList;
+ public List<Variable> selectList;
public ModelExpression model;
public ConstraintExpression query;
- public List results;
+ public List<List<Object>> results;
public String errorString;
+ @SuppressWarnings("unchecked")
public TestDef(String name, String[] resolvers, TestQuery query,
- ModelExpression model, List results, String errorString)
- {
+ ModelExpression model, List results, String errorString) {
this.name = name;
this.resolvers = resolvers;
this.model = model;
@@ -90,10 +74,9 @@
static private class TestQuery {
- public List selectList;
+ public List<Variable> selectList;
public ConstraintExpression query;
- public TestQuery(List selectList, ConstraintExpression query)
- {
+ public TestQuery(List<Variable> selectList, ConstraintExpression query) {
this.selectList = selectList;
this.query = query;
}
@@ -110,8 +93,7 @@
}
public TestDef parse(String name, String[] resolvers, String query,
- String model, String resultDefs, String errorString)
- {
+ String model, String resultDefs, String errorString) {
return new TestDef(name, resolvers,
query == null ? null : parseQuery(new StringTokenizer(query, "() ", true)),
model == null ? null : parseModel(new StringTokenizer(model, "() ", true)),
@@ -120,8 +102,7 @@
}
- private String getToken(StringTokenizer tokenizer)
- {
+ private String getToken(StringTokenizer tokenizer) {
String token;
do {
token = tokenizer.nextToken();
@@ -132,9 +113,7 @@
}
- private ModelExpression parseModel(StringTokenizer tokenizer)
- {
- ModelExpression expr;
+ private ModelExpression parseModel(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if ("(".equals(token)) {
@@ -147,8 +126,7 @@
}
- private ModelOperation parseModelOperation(StringTokenizer tokenizer)
- {
+ private ModelOperation parseModelOperation(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
ModelExpression lhs = parseModel(tokenizer);
ModelExpression rhs = parseModel(tokenizer);
@@ -166,8 +144,7 @@
}
- private ModelResource parseModelResource(String token)
- {
+ private ModelResource parseModelResource(String token) {
try {
int index = Integer.parseInt(token.substring(1));
if (index > models.length) {
@@ -181,8 +158,7 @@
}
- private TestQuery parseQuery(StringTokenizer tokenizer)
- {
+ private TestQuery parseQuery(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if ("(".equals(token)) {
return parseQueryExpression(tokenizer);
@@ -192,11 +168,10 @@
}
- private TestQuery parseQueryExpression(StringTokenizer tokenizer)
- {
+ private TestQuery parseQueryExpression(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if ("query".equals(token)) {
- List selectList = parseSelectList(tokenizer);
+ List<Variable> selectList = parseSelectList(tokenizer);
token = getToken(tokenizer);
if (!"(".equals(token)) {
@@ -211,8 +186,7 @@
}
- private List parseSelectList(StringTokenizer tokenizer)
- {
+ private List<Variable> parseSelectList(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if ("(".equals(token)) {
return parseVariableList(tokenizer);
@@ -222,9 +196,8 @@
}
- private List parseVariableList(StringTokenizer tokenizer)
- {
- List variableList = new ArrayList();
+ private List<Variable> parseVariableList(StringTokenizer tokenizer) {
+ List<Variable> variableList = new ArrayList<Variable>();
String token = getToken(tokenizer);
while (!")".equals(token)) {
variableList.add(parseVariable(token));
@@ -235,8 +208,7 @@
}
- private Variable parseVariable(String token)
- {
+ private Variable parseVariable(String token) {
try {
int index = Integer.parseInt(token.substring(1));
if (index > elements.length) {
@@ -253,8 +225,7 @@
}
- private ConstraintExpression parseConstraintExpression(StringTokenizer tokenizer)
- {
+ private ConstraintExpression parseConstraintExpression(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if ("and".equals(token)) {
return new ConstraintConjunction(parseConstraintArguments(tokenizer));
@@ -269,9 +240,8 @@
}
- private List parseConstraintArguments(StringTokenizer tokenizer)
- {
- List arguments = new ArrayList();
+ private List<ConstraintExpression> parseConstraintArguments(StringTokenizer tokenizer) {
+ List<ConstraintExpression> arguments = new ArrayList<ConstraintExpression>();
while (true) {
String token = getToken(tokenizer);
@@ -288,8 +258,7 @@
}
- private Constraint parseConstraint(StringTokenizer tokenizer)
- {
+ private Constraint parseConstraint(StringTokenizer tokenizer) {
Constraint constraint =
new ConstraintImpl(parseConstraintElement(getToken(tokenizer)),
parseConstraintElement(getToken(tokenizer)),
@@ -303,8 +272,7 @@
}
- private ConstraintElement parseConstraintElement(String token)
- {
+ private ConstraintElement parseConstraintElement(String token) {
try {
int index = Integer.parseInt(token.substring(1));
if (index > elements.length) {
@@ -319,10 +287,10 @@
/**
- * @return A list of lists of result-strings.
+ * @return A list of lists (to arbitrary depth) of result-strings.
*/
- private List parseResultDefinition(StringTokenizer tokenizer)
- {
+ @SuppressWarnings("unchecked")
+ private List parseResultDefinition(StringTokenizer tokenizer) {
logger.debug("Parsing Result Definition");
String token = getToken(tokenizer);
if ("(".equals(token)) {
@@ -334,14 +302,14 @@
/**
- * @return A list of lists of result-strings.
+ * @return A list of lists (to arbitrary depth) of result-strings.
*/
- private List parseResultExpression(StringTokenizer tokenizer)
- {
+ @SuppressWarnings("unchecked")
+ private List parseResultExpression(StringTokenizer tokenizer) {
logger.debug("parseResultExpression");
String token = getToken(tokenizer);
if ("result".equals(token)) {
- List result = parseResultList(tokenizer);
+ List<List<String>> result = parseResultList(tokenizer);
logger.debug("returning result-list-expression: " + result);
return result;
}
@@ -366,10 +334,9 @@
/**
* @return A list of lists of result-strings.
*/
- private List parseResultList(StringTokenizer tokenizer)
- {
+ private List<List<String>> parseResultList(StringTokenizer tokenizer) {
logger.debug("parseResultList");
- List result = new ArrayList();
+ List<List<String>> result = new ArrayList<List<String>>();
String token = getToken(tokenizer);
while (!")".equals(token)) {
@@ -380,7 +347,7 @@
// Create a temporary token to store our tokenised string
String tempToken = "";
- List tempList = new ArrayList();
+ List<String> tempList = new ArrayList<String>();
// Get the next token
token = getToken(tokenizer);
@@ -402,8 +369,7 @@
result.addAll(parseResult(token));
//result.add(tempList);
token = getToken(tokenizer);
- }
- else {
+ } else {
result.addAll(parseResult(token));
token = getToken(tokenizer);
}
@@ -415,10 +381,9 @@
/**
* @return A list of result-strings.
*/
- private List parseResult(String token)
- {
+ private List<List<String>> parseResult(String token) {
logger.debug("parsing result " + token);
- List result = new ArrayList();
+ List<List<String>> result = new ArrayList<List<String>>();
if (token.startsWith("p") || token.startsWith("o") || token.startsWith("s")) {
if (token.endsWith("*")) {
@@ -442,8 +407,8 @@
*
* Specifically a list of result-expressions.
*/
- private LinkedList parseProductTerms(StringTokenizer tokenizer)
- {
+ @SuppressWarnings("unchecked")
+ private LinkedList parseProductTerms(StringTokenizer tokenizer) {
logger.debug("parseProductTerms");
LinkedList result = new LinkedList();
@@ -464,8 +429,8 @@
* @param productTerms A list of lists of lists of result-strings, from parseProductTerms.
* @return A list of lists of result-strings.
*/
- private List produceProduct(LinkedList productTerms)
- {
+ @SuppressWarnings("unchecked")
+ private List produceProduct(LinkedList productTerms) {
logger.debug("produceProduct");
if (productTerms.size() == 1) {
return (List)productTerms.get(0);
@@ -498,8 +463,8 @@
}
}
- private LinkedList parseDivideTerms(StringTokenizer tokenizer)
- {
+ @SuppressWarnings("unchecked")
+ private LinkedList parseDivideTerms(StringTokenizer tokenizer) {
String token = getToken(tokenizer);
if (!"(".equals(token)) {
throw new IllegalArgumentException("Divide requires s-expr for foreach " + token);
@@ -511,8 +476,8 @@
return parseForeachResults(tokenizer);
}
- private LinkedList parseForeachResults(StringTokenizer tokenizer)
- {
+ @SuppressWarnings("unchecked")
+ private LinkedList parseForeachResults(StringTokenizer tokenizer) {
LinkedList result = new LinkedList();
String token = getToken(tokenizer);
@@ -527,8 +492,8 @@
return result;
}
- private List produceDivide(List divideTerm, List divisor)
- {
+ @SuppressWarnings("unchecked")
+ private List produceDivide(List divideTerm, List divisor) {
List result = new ArrayList();
Iterator i = divideTerm.iterator();
while (i.hasNext()) {
@@ -539,8 +504,8 @@
return result;
}
- private List produceDivideResult(List divideResult, List divisor)
- {
+ @SuppressWarnings("unchecked")
+ private List produceDivideResult(List divideResult, List divisor) {
List result = new ArrayList();
assert divisor.size() % divideResult.size() == 0;
Modified: branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver/java/org/mulgara/resolver/XADatabaseSessionUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -33,13 +33,11 @@
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.InetAddress;
import java.util.*;
// Third party packages
import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
-import org.jrdf.vocabulary.RDF; // JRDF
// Locally written packages
import org.mulgara.query.*;
@@ -47,9 +45,6 @@
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.server.Session;
-import org.mulgara.store.StoreException;
-import org.mulgara.store.nodepool.NodePool;
-import org.mulgara.store.stringpool.StringPool;
import org.mulgara.util.FileUtil;
/**
@@ -66,30 +61,21 @@
*/
public class XADatabaseSessionUnitTest extends TestCase {
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
/**
* The URI of the {@link #database}'s system model:
* <code>local:database#</code>.
*/
- private static final URI systemModelURI;
+ @SuppressWarnings("unused")
+ private static final URI systemModelURI = URI.create("local:database#");
/** The URI of the {@link #database}'s system model type. */
- private static final URI memoryModelURI;
+ @SuppressWarnings("unused")
+ private static final URI memoryModelURI = URI.create(Mulgara.NAMESPACE+"MemoryModel");
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- memoryModelURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
/** Logger. */
- private static Logger logger =
- Logger.getLogger(XADatabaseSessionUnitTest.class.getName());
+ private static Logger logger = Logger.getLogger(XADatabaseSessionUnitTest.class.getName());
/**
* In-memory test {@link Database} used to generate {@link DatabaseSession}s
@@ -563,8 +549,8 @@
String tempResolverFactoryClassName =
"org.mulgara.resolver.memory.MemoryResolverFactory";
- String ruleLoaderFactoryClassName =
- "org.mulgara.rules.RuleLoaderFactory";
+ @SuppressWarnings("unused")
+ String ruleLoaderFactoryClassName = "org.mulgara.rules.RuleLoaderFactory";
// Create a database which keeps its system models on the Java heap
database = new Database(
@@ -614,20 +600,18 @@
// Test cases
//
+ @SuppressWarnings("unchecked")
public void testModel() {
try {
logger.debug("Testing: " + test.errorString);
Session session = database.newSession();
try {
- List orderList = new ArrayList();
- Iterator i = test.selectList.iterator();
- while (i.hasNext()) {
- orderList.add(new Order((Variable)i.next(), true));
- }
+ List<Order> orderList = new ArrayList<Order>();
+ for (Variable v: test.selectList) orderList.add(new Order(v, true));
// Evaluate the query
Answer answer = new ArrayAnswer(session.query(new Query(
- test.selectList, // SELECT
+ (List<Object>)(List)test.selectList, // SELECT
test.model, // FROM
test.query, // WHERE
null, // HAVING
@@ -639,19 +623,15 @@
logger.debug("Results Expected in " + test.errorString + " = " + test.results);
logger.debug("Results Received in " + test.errorString + " = " + answer);
- i = test.results.iterator();
+ Iterator<List<Object>> i = test.results.iterator();
answer.beforeFirst();
while (true) {
boolean hasAnswer = answer.next();
boolean hasResult = i.hasNext();
- if (!hasAnswer && !hasResult) {
- break;
- }
- assertTrue(test.errorString, hasAnswer && hasResult);
- Iterator j = ((List)i.next()).iterator();
+ if (!hasAnswer && !hasResult) break;
int c = 0;
- while (j.hasNext()) {
- assertEquals(test.errorString, j.next().toString(), answer.getObject(c++).toString());
+ for (Object obj: i.next()) {
+ assertEquals(test.errorString, obj.toString(), answer.getObject(c++).toString());
}
}
} finally {
@@ -669,6 +649,7 @@
/**
* Fail with an unexpected exception
*/
+ @SuppressWarnings("unused")
private void fail(Throwable throwable) {
fail(null, throwable);
}
Modified: branches/nw-interface/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-filesystem/java/org/mulgara/resolver/filesystem/FileSystemResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,23 +28,16 @@
package org.mulgara.resolver.filesystem;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
-import java.util.HashSet;
-import java.util.Set;
// Third party packages
import org.apache.log4j.Logger;
import org.jrdf.vocabulary.RDF;
// Locally written packages
-import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.*;
-import org.mulgara.store.statement.StatementStore;
-import org.mulgara.store.xa.SimpleXAResourceException;
-import org.mulgara.store.xa.XAResolverSessionFactory;
/**
* Manages the creation and initialisation of a file system resolver.
@@ -82,28 +75,11 @@
/** The exclusion predicate node id */
private long excludeNode;
- /** The preallocated local node representing FileSystems */
- private long modelType;
-
/**
* The URL associated with the FileSystem type.
*/
- private static final URI modelTypeURI;
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "FileSystemModel");
- static {
-
- // Attempt to create the URI which represents our file system model type
- try {
-
- modelTypeURI = new URI(Mulgara.NAMESPACE + "FileSystemModel");
- assert modelTypeURI != null;
- } catch (URISyntaxException e) {
-
- // We should never get this
- throw new Error("Bad hardcoded FileSystem model URI", e);
- }
- }
-
/**
* The preallocated local node representing the system model and it's type(<code>#</code>).
*/
@@ -129,8 +105,8 @@
}
// Set the model type
- modelType = initializer.getSystemModelType();
-
+ initializer.getSystemModelType();
+
// Set the system model and its type
systemModel = initializer.getSystemModel();
systemModelType = initializer.getSystemModelType();
Modified: branches/nw-interface/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java
===================================================================
--- branches/nw-interface/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-gis/java/org/mulgara/resolver/gis/WritableGISResolver.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -39,7 +39,6 @@
import org.mulgara.query.*;
import org.mulgara.query.rdf.*;
import org.mulgara.resolver.spi.*;
-import org.mulgara.store.*;
import org.mulgara.store.statement.*;
import org.mulgara.store.tuples.*;
import org.mulgara.util.*;
@@ -69,12 +68,12 @@
*/
public class WritableGISResolver extends ReadOnlyGISResolver {
- /**
- * Logger. This is named after the class.
- */
- private final static Logger log = Logger.getLogger(WritableGISResolver.class.
- getName());
+ /** Logger. */
+ private final static Logger log = Logger.getLogger(WritableGISResolver.class.getName());
+ /** Model type */
+ private static final URI MODEL_TYPE = URI.create(Mulgara.NAMESPACE + "Model");
+
/**
* Constructor.
*
@@ -106,13 +105,10 @@
if (occurs) {
try {
insertStatements(model, statements);
- }
- catch (Exception exception) {
+ } catch (Exception exception) {
throw new ResolverException("Failed to insert statements.", exception);
}
- }
- else {
-
+ } else {
throw new ResolverException("Delete not implemented");
}
}
@@ -160,7 +156,7 @@
yLongs = getPointLongitudes(y, ylong, model);
//join all points (generate inferred statements)
- List tupleList = new ArrayList();
+ List<Resolution> tupleList = new ArrayList<Resolution>();
tupleList.add(xPoints);
tupleList.add(xLats);
tupleList.add(xLongs);
@@ -175,8 +171,7 @@
//insert the inferred statements
super.resolver.modifyModel(model, inferredStatements, true);
- }
- finally {
+ } finally {
//clean up
if (tempModel != -1) {
dropTemporaryModel(tempModel);
@@ -252,11 +247,9 @@
StatementStore.VARIABLES[1],
StatementStore.VARIABLES[2]
};
- projectedDistTypes = TuplesOperations.project(distanceTypes,
- Arrays.asList(vars));
+ projectedDistTypes = TuplesOperations.project(distanceTypes, Arrays.asList(vars));
if (!isEmpty(distanceTypes)) {
- distTypeStatements = new TuplesWrapperStatements((Tuples) distanceTypes.
- clone(), d, vars[1], vars[2]);
+ distTypeStatements = new TuplesWrapperStatements((Tuples)distanceTypes.clone(), d, vars[1], vars[2]);
}
//delete the statements
@@ -269,12 +262,9 @@
if (!isEmpty(distTypeStatements)) {
super.resolver.modifyModel(model, distTypeStatements, false);
}
- }
- finally {
+ } finally {
//clean up
- if (tempModel != -1) {
- dropTemporaryModel(tempModel);
- }
+ if (tempModel != -1) dropTemporaryModel(tempModel);
close(xPoints);
close(yPoints);
close(points);
@@ -295,11 +285,7 @@
* @throws TuplesException
*/
private boolean isEmpty(Cursor cursor) throws TuplesException {
-
- boolean empty = (cursor == null) ||
- (cursor.getRowCardinality() == Cursor.ZERO);
-
- return empty;
+ return (cursor == null) || (cursor.getRowCardinality() == Cursor.ZERO);
}
/**
@@ -339,23 +325,16 @@
dist = getDistanceTypes(distVar, model);
//join all points (generate all point combinations)
- List tupleList = new ArrayList();
+ List<Resolution> tupleList = new ArrayList<Resolution>();
tupleList.add(xPoints);
tupleList.add(dist);
tupleList.add(yPoints);
return TuplesOperations.join(tupleList);
- }
- finally {
+ } finally {
//clean up
- if (xPoints != null) {
- xPoints.close();
- }
- if (dist != null) {
- dist.close();
- }
- if (yPoints != null) {
- yPoints.close();
- }
+ if (xPoints != null) xPoints.close();
+ if (dist != null) dist.close();
+ if (yPoints != null) yPoints.close();
}
}
@@ -383,19 +362,14 @@
all = getAllStatements(distVar, p, o, model);
//join all statements for each Distance
- List tupleList = new ArrayList();
+ List<Resolution> tupleList = new ArrayList<Resolution>();
tupleList.add(all);
tupleList.add(dist);
return TuplesOperations.join(tupleList);
- }
- finally {
+ } finally {
//clean up
- if (all != null) {
- all.close();
- }
- if (dist != null) {
- dist.close();
- }
+ if (all != null) all.close();
+ if (dist != null) dist.close();
}
}
@@ -418,8 +392,7 @@
return super.resolver.resolve(constraint);
}
catch (QueryException queryException) {
- throw new ResolverException("Could not get all statements.",
- queryException);
+ throw new ResolverException("Could not get all statements.", queryException);
}
}
@@ -438,11 +411,9 @@
LocalNode rdfType = new LocalNode(RDF_TYPE);
LocalNode geoPoint = new LocalNode(GEO_POINT);
LocalNode modelNode = new LocalNode(model);
- Constraint constraint = new ConstraintImpl(var, rdfType, geoPoint,
- modelNode);
+ Constraint constraint = new ConstraintImpl(var, rdfType, geoPoint, modelNode);
return super.resolver.resolve(constraint);
- }
- catch (QueryException queryException) {
+ } catch (QueryException queryException) {
throw new ResolverException("Could not get Points.", queryException);
}
}
@@ -462,11 +433,9 @@
LocalNode rdfType = new LocalNode(RDF_TYPE);
LocalNode distance = new LocalNode(DIS_DISTANCE);
LocalNode modelNode = new LocalNode(model);
- Constraint constraint = new ConstraintImpl(var, rdfType, distance,
- modelNode);
+ Constraint constraint = new ConstraintImpl(var, rdfType, distance, modelNode);
return super.resolver.resolve(constraint);
- }
- catch (QueryException queryException) {
+ } catch (QueryException queryException) {
throw new ResolverException("Could not get Distances.", queryException);
}
}
@@ -488,11 +457,9 @@
LocalNode modelNode = new LocalNode(model);
Constraint constraint = new ConstraintImpl(var, geoLat, lat, modelNode);
return super.resolver.resolve(constraint);
+ } catch (QueryException queryException) {
+ throw new ResolverException("Could not get Point Latitudes.", queryException);
}
- catch (QueryException queryException) {
- throw new ResolverException("Could not get Point Latitudes.",
- queryException);
- }
}
/**
@@ -512,11 +479,9 @@
LocalNode modelNode = new LocalNode(model);
Constraint constraint = new ConstraintImpl(var, geoLong, lon, modelNode);
return super.resolver.resolve(constraint);
+ } catch (QueryException queryException) {
+ throw new ResolverException("Could not get Point Longitudes.", queryException);
}
- catch (QueryException queryException) {
- throw new ResolverException("Could not get Point Longitudes.",
- queryException);
- }
}
/**
@@ -530,11 +495,8 @@
* @return Statements
* @throws ResolverException
*/
- private Statements getInferredStatements(Tuples points) throws
- ResolverException {
-
- return new GISDistanceStatements(points, super.gisCalculator,
- resolverSession);
+ private Statements getInferredStatements(Tuples points) throws ResolverException {
+ return new GISDistanceStatements(points, super.gisCalculator, resolverSession);
}
/**
@@ -555,14 +517,11 @@
if (log.isDebugEnabled()) {
log.debug("Creating temp Model: " + model + " with ID: " + tempModel);
}
- super.resolver.createModel(tempModel,
- new URI(Mulgara.NAMESPACE + "Model"));
+ super.resolver.createModel(tempModel, MODEL_TYPE);
return tempModel;
+ } catch (Exception exception) {
+ throw new ResolverException("Failed to create temporary Model.", exception);
}
- catch (Exception exception) {
- throw new ResolverException("Failed to create temporary Model.",
- exception);
- }
}
/**
@@ -572,10 +531,7 @@
* @throws ResolverException
*/
private void dropTemporaryModel(long model) throws ResolverException {
-
- if (log.isDebugEnabled()) {
- log.debug("Dropping temp Model with ID: " + model);
- }
+ if (log.isDebugEnabled()) log.debug("Dropping temp Model with ID: " + model);
super.resolver.removeModel(model);
}
Modified: branches/nw-interface/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,7 +28,6 @@
package org.mulgara.resolver.lucene;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
// Third party packages
@@ -62,17 +61,13 @@
*/
public class LuceneResolverFactory implements ResolverFactory {
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(LuceneResolverFactory.class.getName());
+ /** Logger. */
+ private static Logger logger = Logger.getLogger(LuceneResolverFactory.class.getName());
private String directory;
private URI modelTypeURI;
private long rdfType;
private long systemModel;
- private ResolverFactory systemResolverFactory;
//
// Constructors
@@ -89,7 +84,7 @@
}
try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "LuceneModel");
+ modelTypeURI = URI.create(Mulgara.NAMESPACE + "LuceneModel");
assert modelTypeURI != null;
// Initialize fields
@@ -99,13 +94,9 @@
systemModel = initializer.getSystemModel();
- systemResolverFactory = initializer.getSystemResolverFactory();
-
// Claim mulgara:LuceneModel
initializer.addModelType(modelTypeURI, this);
- } catch (URISyntaxException eu) {
- throw new Error("Bad hardcoded lucene model URI", eu);
} catch (NoSystemResolverFactoryException en) {
throw new InitializerException("Unable to obtain system resolver", en);
}
@@ -146,6 +137,7 @@
public static ResolverFactory newInstance(
ResolverFactoryInitializer resolverFactoryInitializer
) throws InitializerException {
+ if (logger.isDebugEnabled()) logger.debug("Creating Lucene resolver factory");
return new LuceneResolverFactory(resolverFactoryInitializer);
}
@@ -160,6 +152,7 @@
*/
public Resolver newResolver(boolean canWrite, ResolverSession resolverSession, Resolver systemResolver)
throws ResolverFactoryException {
+ if (logger.isDebugEnabled()) logger.debug("Creating Lucene resolver");
return canWrite
? new LuceneResolver(systemResolver, rdfType, systemModel, modelTypeURI, resolverSession, directory)
: new ReadOnlyLuceneResolver(systemResolver, rdfType, systemModel, modelTypeURI, resolverSession, directory);
Modified: branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolution.java
===================================================================
--- branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolution.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolution.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -31,12 +31,11 @@
import java.util.*;
// Third party packages
-import org.apache.log4j.Logger; // Apache Log4J
+// import org.apache.log4j.Logger; // Apache Log4J
// Locally written packages
import org.mulgara.query.*;
import org.mulgara.resolver.spi.Resolution;
-import org.mulgara.resolver.spi.Resolver;
import org.mulgara.store.tuples.AbstractTuples;
import org.mulgara.store.tuples.Tuples;
@@ -52,13 +51,9 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class MemoryResolution extends AbstractTuples implements Resolution
-{
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(MemoryResolution.class.getName());
+public class MemoryResolution extends AbstractTuples implements Resolution {
+ /** Logger. */
+ // private static Logger logger = Logger.getLogger(MemoryResolution.class.getName());
/**
* The constraint this instance resolves.
@@ -73,13 +68,13 @@
* constructor, so as to avoid side effects when models are subsequently
* modified.
*/
- private final Set statingSet;
+ private final Set<Stating> statingSet;
/**
* The {@link Iterator} use to obtain the {@link #stating} from the
* {@link #statingSet}.
*/
- private Iterator iterator;
+ private Iterator<Stating> iterator;
/**
* The current stating, <code>null</code> if not on a row.
@@ -110,8 +105,7 @@
* @throws IllegalArgumentException if the <var>constraint</var> or
* <var>statingSet</var> are <code>null</code>
*/
- MemoryResolution(Constraint constraint, Set statingSet)
- {
+ MemoryResolution(Constraint constraint, Set<Stating> statingSet) {
// Validate "constraint" parameter
if (constraint == null) {
throw new IllegalArgumentException( "Null \"constraint\" parameter");
@@ -127,23 +121,21 @@
// Clone the statings, for isolation from subsequent changes
synchronized (statingSet) {
- this.statingSet = Collections.unmodifiableSet(new HashSet(statingSet));
+ this.statingSet = Collections.unmodifiableSet(new HashSet<Stating>(statingSet));
}
// Calculate columnIndex and set the variable list
int length = 0;
int[] temp = new int[4];
- List variableList = new ArrayList(4);
+ List<Variable> variableList = new ArrayList<Variable>(4);
for (int i=0; i<4; i++) {
if (constraint.getElement(i) instanceof Variable) {
temp[length++] = i;
- variableList.add(constraint.getElement(i));
+ variableList.add((Variable)constraint.getElement(i));
}
}
columnIndex = new int[length];
- for (int i=0; i<length; i++) {
- columnIndex[i] = temp[i];
- }
+ for (int i=0; i<length; i++) columnIndex[i] = temp[i];
setVariables(variableList);
}
@@ -151,13 +143,11 @@
// Methods implementing Resolution
//
- public Constraint getConstraint()
- {
+ public Constraint getConstraint() {
return constraint;
}
- public boolean isComplete()
- {
+ public boolean isComplete() {
return false;
}
@@ -165,23 +155,15 @@
// Methods implementing Cursor (superinterface of Statements)
//
- public void beforeFirst(long[] prefix, int suffixTruncation)
- throws TuplesException
- {
+ public void beforeFirst(long[] prefix, int suffixTruncation) throws TuplesException {
// Validate "prefix" parameter
- if (prefix == null) {
- throw new IllegalArgumentException("Null \"prefix\" parameter");
- }
+ if (prefix == null) throw new IllegalArgumentException("Null \"prefix\" parameter");
if (prefix.length > 4) {
- throw new TuplesException(
- "Bad prefix (>4): " + toString(prefix)
- );
+ throw new TuplesException("Bad prefix (>4): " + toString(prefix));
}
// Validate "suffixTruncation" parameter
- if (suffixTruncation != 0) {
- throw new IllegalArgumentException("Nonzero suffix truncationr");
- }
+ if (suffixTruncation != 0) throw new IllegalArgumentException("Nonzero suffix truncationr");
// Reset fields
iterator = statingSet.iterator();
@@ -189,31 +171,23 @@
stating = null;
}
- public Object clone()
- {
- MemoryResolution cloned = (MemoryResolution) super.clone();
-
+ public Object clone() {
// Copy mutable fields by value (all fields are immutable)
-
- return cloned;
+ return (MemoryResolution) super.clone();
}
/**
* Close the RDF/XML formatted input stream.
*/
- public void close() throws TuplesException
- {
+ public void close() throws TuplesException {
// null implementation
}
/**
* @param column 0 for the subject, 1 for the predicate, 2 for the object
*/
- public long getColumnValue(int column) throws TuplesException
- {
- if (stating == null) {
- throw new TuplesException("Not on a row");
- }
+ public long getColumnValue(int column) throws TuplesException {
+ if (stating == null) throw new TuplesException("Not on a row");
if (column < 0 || column >= columnIndex.length) {
throw new TuplesException("No such column: " + column);
@@ -222,28 +196,24 @@
return stating.get(columnIndex[column]);
}
- public List getOperands()
- {
- return Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<Tuples> getOperands() {
+ return (List<Tuples>)Collections.EMPTY_LIST;
}
- public long getRowCount() throws TuplesException
- {
+ public long getRowCount() throws TuplesException {
return statingSet.size();
}
- public long getRowUpperBound() throws TuplesException
- {
+ public long getRowUpperBound() throws TuplesException {
return getRowCount();
}
- public boolean hasNoDuplicates() throws TuplesException
- {
+ public boolean hasNoDuplicates() throws TuplesException {
return false;
}
- public boolean isColumnEverUnbound(int column) throws TuplesException
- {
+ public boolean isColumnEverUnbound(int column) throws TuplesException {
switch (column) {
case 0: case 1: case 2: case 3:
return false;
@@ -252,8 +222,7 @@
}
}
- public boolean next() throws TuplesException
- {
+ public boolean next() throws TuplesException {
if (iterator == null) {
throw new TuplesException("Haven't called beforeFirst");
}
@@ -268,8 +237,7 @@
}
for (int i = 0; i < 4; i++) {
if (constraint.getElement(i) instanceof LocalNode &&
- ((LocalNode)constraint.getElement(i)).getValue() != stating.get(i))
- {
+ ((LocalNode)constraint.getElement(i)).getValue() != stating.get(i)) {
continue filtering_statings;
}
}
Modified: branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java
===================================================================
--- branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolver.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -35,7 +35,6 @@
// Third party packages
import org.apache.log4j.Logger;
-import org.jrdf.graph.URIReference;
import org.jrdf.graph.Node;
// Locally written packages
@@ -43,11 +42,9 @@
import org.mulgara.resolver.spi.*;
import org.mulgara.store.nodepool.NodePool;
import org.mulgara.store.nodepool.NodePoolException;
-import org.mulgara.store.statement.StatementStoreException;
import org.mulgara.store.stringpool.SPObject;
import org.mulgara.store.stringpool.SPObjectFactory;
import org.mulgara.store.stringpool.StringPoolException;
-import org.mulgara.store.tuples.AbstractTuples;
import org.mulgara.store.tuples.Tuples;
import org.mulgara.store.xa.XAResolverSession;
import org.mulgara.store.xa.SimpleXAResourceException;
@@ -85,7 +82,7 @@
* The shared set of {@link Stating}s for the factory that produced this
* instance.
*/
- private final Set statingSet;
+ private final Set<Stating> statingSet;
private XAResolverSession xaResolverSession;
@@ -112,7 +109,7 @@
long rdfType,
long systemModel,
URI modelTypeURI,
- Set statingSet)
+ Set<Stating> statingSet)
throws ResolverFactoryException {
// Validate "modelType" parameter
@@ -132,7 +129,7 @@
MemoryResolver(long rdfType,
long systemModel,
URI modelTypeURI,
- Set statingSet,
+ Set<Stating> statingSet,
XAResolverSession resolverSession)
throws ResolverFactoryException {
@@ -213,11 +210,8 @@
}
// Remove all the statings belonging to the model
- for (Iterator i = statingSet.iterator(); i.hasNext();) {
- Stating stating = (Stating) i.next();
- if (stating.get(3) == model) {
- i.remove();
- }
+ for (Iterator<Stating> i = statingSet.iterator(); i.hasNext();) {
+ if (i.next().get(3) == model) i.remove();
}
}
@@ -251,14 +245,10 @@
// Modify the occurrence of the stating
if (occurs) {
- if (logger.isDebugEnabled()) {
- logger.debug("Adding " + stating);
- }
+ if (logger.isDebugEnabled()) logger.debug("Adding " + stating);
statingSet.add(stating);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Removing " + stating);
- }
+ if (logger.isDebugEnabled()) logger.debug("Removing " + stating);
statingSet.remove(stating);
}
}
@@ -268,8 +258,7 @@
logger.debug("Modified memory model " + model + ": " + statingSet);
}
} catch (TuplesException e) {
- throw new ResolverException(
- "Couldn't modify model, and may have corrupted the store", e);
+ throw new ResolverException("Couldn't modify model, and may have corrupted the store", e);
}
}
@@ -357,18 +346,13 @@
* @throws IllegalArgumentException if the <var>statingSet</var> contains any
* element which is not a stating (<code>long[4]</code>)
*/
- private static String toString(Set statingSet)
- {
- if (statingSet == null) {
- return "null";
- }
+ @SuppressWarnings("unused")
+ private static String toString(Set<Stating> statingSet) {
+ if (statingSet == null) return "null";
StringBuffer buffer = new StringBuffer("[");
- for (Iterator i = statingSet.iterator(); i.hasNext();) {
- Object object = i.next();
- buffer.append((object instanceof long[])
- ? AbstractTuples.toString((long[]) object)
- : object.toString());
+ for (Iterator<Stating> i = statingSet.iterator(); i.hasNext();) {
+ buffer.append(i.next());
buffer.append(i.hasNext() ? " " : "]");
}
Modified: branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-memory/java/org/mulgara/resolver/memory/MemoryResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,7 +28,6 @@
package org.mulgara.resolver.memory;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +40,6 @@
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.*;
-import org.mulgara.store.nodepool.NodePool;
import org.mulgara.store.xa.SimpleXAResourceException;
import org.mulgara.store.xa.XAResolverSession;
import org.mulgara.store.xa.XAResolverSessionFactory;
@@ -72,22 +70,9 @@
*/
private long rdfType;
- /**
- * The preallocated local node representing models stored on the Java heap.
- */
- private long modelType;
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "MemoryModel");
- private static final URI modelTypeURI;
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- assert modelTypeURI != null;
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded memory model URI", e);
- }
- }
-
/**
* The preallocated local node representing the system model (<code>#</code>).
*/
@@ -97,7 +82,7 @@
* The {@link Stating}s which occur in all models created by resolvers
* created by this factory.
*/
- private final Set statingSet = new HashSet();
+ private final Set<Stating> statingSet = new HashSet<Stating>();
private XAResolverSessionFactory sessionFactory;
@@ -113,15 +98,13 @@
{
// Validate parameters
if (initializer == null) {
- throw new IllegalArgumentException(
- "Null 'resolverFactoryInitializer' parameter");
+ throw new IllegalArgumentException("Null 'resolverFactoryInitializer' parameter");
}
// Initialize fields
rdfType = initializer.preallocate(new URIReferenceImpl(RDF.TYPE));
+ initializer.preallocate(new URIReferenceImpl(modelTypeURI));
- modelType = initializer.preallocate(new URIReferenceImpl(modelTypeURI));
-
systemModel = initializer.getSystemModel();
// Claim mulgara:MemoryModel
@@ -146,15 +129,13 @@
// Methods implementing SystemResolverFactory (excluding newResolver)
//
- public URI getSystemModelTypeURI()
- {
+ public URI getSystemModelTypeURI() {
return modelTypeURI;
}
public void setDatabaseMetadata(DatabaseMetadata metadata) {
rdfType = metadata.getRdfTypeNode();
- modelType = metadata.getSystemModelTypeNode();
systemModel = metadata.getSystemModelNode();
}
@@ -169,8 +150,7 @@
* This is actually a non-operation, because there are no persistent
* resources.
*/
- public void close()
- {
+ public void close() {
// null implementation
}
@@ -180,8 +160,7 @@
* This is actually a non-operation, because there are no persistent
* resources.
*/
- public void delete()
- {
+ public void delete() {
// null implementation
}
@@ -195,39 +174,33 @@
* found or created
*/
public static ResolverFactory newInstance(ResolverFactoryInitializer initializer)
- throws InitializerException
- {
+ throws InitializerException {
+ if (logger.isDebugEnabled()) logger.debug("Creating memory resolver factory");
return new MemoryResolverFactory(initializer);
}
- public static ResolverFactory newInstance(FactoryInitializer initializer,
- XAResolverSessionFactory sessionFactory)
- throws InitializerException
- {
+ public static ResolverFactory newInstance(
+ FactoryInitializer initializer, XAResolverSessionFactory sessionFactory
+ ) throws InitializerException {
+ if (logger.isDebugEnabled()) logger.debug("Creating memory resolver factory");
return new MemoryResolverFactory(initializer, sessionFactory);
}
- public int[] recover() throws SimpleXAResourceException
- {
+ public int[] recover() {
return new int[] {};
}
- public void selectPhase(int phaseNumber) throws IOException,
- SimpleXAResourceException
- {
+ public void selectPhase(int phaseNumber) throws SimpleXAResourceException {
throw new SimpleXAResourceException("Unable to selectPhase on MemoryResolver");
}
- public void clear() throws IOException, SimpleXAResourceException
- {
+ public void clear() {
return;
}
- public void clear(int phaseNumber) throws IOException,
- SimpleXAResourceException
- {
+ public void clear(int phaseNumber) {
return;
}
@@ -244,9 +217,10 @@
* <code>null</code>
* @throws ResolverFactoryException {@inheritDoc}
*/
- public Resolver newResolver(boolean canWrite,
- ResolverSession resolverSession, Resolver systemResolver) throws ResolverFactoryException
- {
+ public Resolver newResolver(
+ boolean canWrite, ResolverSession resolverSession, Resolver systemResolver
+ ) throws ResolverFactoryException {
+ if (logger.isDebugEnabled()) logger.debug("Creating memory resolver");
return new MemoryResolver(resolverSession,
systemResolver,
rdfType,
@@ -256,9 +230,9 @@
}
- public SystemResolver newResolver(boolean canWrite) throws ResolverFactoryException
- {
+ public SystemResolver newResolver(boolean canWrite) throws ResolverFactoryException {
assert sessionFactory != null;
+ if (logger.isDebugEnabled()) logger.debug("Creating memory resolver factory");
try {
return new MemoryResolver(rdfType, systemModel, modelTypeURI, statingSet,
(XAResolverSession) sessionFactory.newWritableResolverSession());
Modified: branches/nw-interface/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-nodetype/java/org/mulgara/resolver/nodetype/NodeTypeResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,7 +28,6 @@
package org.mulgara.resolver.nodetype;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
// Third party packages
@@ -52,13 +51,9 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class NodeTypeResolverFactory implements ResolverFactory
-{
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(NodeTypeResolverFactory.class.getName());
+public class NodeTypeResolverFactory implements ResolverFactory {
+ /** Logger. */
+ private static Logger logger = Logger.getLogger(NodeTypeResolverFactory.class.getName());
/** The preallocated local node representing the <code>rdf:type</code> property. */
private long rdfType;
@@ -74,23 +69,12 @@
/** The URI for the modelType. */
- private static final URI modelTypeURI;
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "TypeModel");
/** The URI for the internal URI reference type. */
- private static final URI mulgaraUriReferenceURI;
+ private static final URI mulgaraUriReferenceURI = URI.create(Mulgara.NAMESPACE + "uriReference");
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "TypeModel");
- mulgaraUriReferenceURI = new URI(Mulgara.NAMESPACE + "uriReference");
- assert modelTypeURI != null;
- assert mulgaraUriReferenceURI != null;
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded internal URIs for Node Types", e);
- }
- }
-
/**
* The preallocated local node representing the system model (<code>#</code>).
*/
@@ -110,20 +94,14 @@
// Validate "resolverFactoryInitializer" parameter
if (initializer == null) {
- throw new IllegalArgumentException(
- "Null \"resolverFactoryInitializer\" parameter"
- );
+ throw new IllegalArgumentException("Null \"resolverFactoryInitializer\" parameter");
}
// intialize the fields
rdfType = initializer.preallocate(new URIReferenceImpl(RDF.TYPE));
-
modelType = initializer.preallocate(new URIReferenceImpl(modelTypeURI));
-
rdfsLiteral = initializer.preallocate(new URIReferenceImpl(RDFS.LITERAL));
-
mulgaraUriReference = initializer.preallocate(new URIReferenceImpl(mulgaraUriReferenceURI));
-
systemModel = initializer.getSystemModel();
// Claim the type supported by the resolver
@@ -137,16 +115,14 @@
/**
* {@inheritDoc ResolverFactory}
*/
- public void close()
- {
+ public void close() {
// null implementation
}
/**
* {@inheritDoc ResolverFactory}
*/
- public void delete()
- {
+ public void delete() {
// null implementation
}
@@ -161,6 +137,7 @@
public static ResolverFactory newInstance(
ResolverFactoryInitializer resolverFactoryInitializer
) throws InitializerException {
+ if (logger.isDebugEnabled()) logger.debug("Creating new node type resolver factory");
return new NodeTypeResolverFactory(resolverFactoryInitializer);
}
@@ -177,6 +154,7 @@
boolean canWrite, ResolverSession resolverSession, Resolver systemResolver
) throws ResolverFactoryException {
+ if (logger.isDebugEnabled()) logger.debug("Creating new node type resolver");
return new NodeTypeResolver(
resolverSession, systemResolver, rdfType, systemModel,
rdfsLiteral, mulgaraUriReference, modelType, modelTypeURI
Modified: branches/nw-interface/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-prefix/java/org/mulgara/resolver/prefix/PrefixResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -13,12 +13,10 @@
package org.mulgara.resolver.prefix;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
// Third party packages
import org.apache.log4j.Logger;
-import org.jrdf.vocabulary.*;
// Locally written packages
import org.mulgara.query.rdf.Mulgara;
@@ -30,41 +28,22 @@
*
* @created 2005-4-19
* @author <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
- * @version $Revision: $
- * @modified $Date: $ @maintenanceAuthor $Author: $
* @copyright © 2005 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
* @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
*/
-public class PrefixResolverFactory implements ResolverFactory
-{
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(PrefixResolverFactory.class.getName());
+public class PrefixResolverFactory implements ResolverFactory {
+ /** Logger. */
+ private static Logger logger = Logger.getLogger(PrefixResolverFactory.class.getName());
-
/** The URI for the modelType. */
- private static final URI modelTypeURI;
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "PrefixModel");
/** The URI for prefixes. */
- private static final URI mulgaraPrefixURI;
+ private static final URI mulgaraPrefixURI = URI.create(Mulgara.NAMESPACE + "prefix");
/** The preallocated local node representing the prefix predicate. */
private long mulgaraPrefix;
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "PrefixModel");
- mulgaraPrefixURI = new URI(Mulgara.NAMESPACE + "prefix");
- assert modelTypeURI != null;
- assert mulgaraPrefixURI != null;
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded internal URIs for Node Types", e);
- }
- }
-
-
//
// Constructors
//
@@ -94,16 +73,14 @@
/**
* {@inheritDoc ResolverFactory}
*/
- public void close()
- {
+ public void close() {
// null implementation
}
/**
* {@inheritDoc ResolverFactory}
*/
- public void delete()
- {
+ public void delete() {
// null implementation
}
@@ -133,9 +110,7 @@
public Resolver newResolver(
boolean canWrite, ResolverSession resolverSession, Resolver systemResolver
) throws ResolverFactoryException {
-
- return new PrefixResolver(
- resolverSession, systemResolver, mulgaraPrefix, modelTypeURI
- );
+ if (logger.isDebugEnabled()) logger.debug("Creating new Prefix resolver");
+ return new PrefixResolver(resolverSession, systemResolver, mulgaraPrefix, modelTypeURI);
}
}
Modified: branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -43,7 +43,6 @@
// Java 2 standard packages
import java.net.URI;
-import java.net.URISyntaxException;
// Third party packages
import org.apache.log4j.Logger;
@@ -52,7 +51,6 @@
// Locally written packages
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
-import org.mulgara.query.rdf.LiteralImpl;
import org.mulgara.resolver.spi.*;
/**
@@ -83,23 +81,10 @@
/** Node id for the relational model type */
private long relationalModelTypeNode;
- /** The preallocated local node representing FileSystems */
- private long modelType;
-
/** The URL associated with the Relational Model type. */
- private static final URI modelTypeURI;
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "RelationalModel");
- static {
- // Attempt to create the URI which represents our file system model type
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "RelationalModel");
- } catch (URISyntaxException e) {
- // We should never get this
- throw new Error("Bad hardcoded Relational Model URI", e);
- }
- }
-
/**
* The preallocated local node representing the system model and it's type(<code>#</code>).
*/
@@ -121,9 +106,6 @@
throw new IllegalArgumentException("Null 'initializer' parameter");
}
- // Set the model type
- modelType = initializer.getSystemModelType();
-
// Set the system model and its type
systemModel = initializer.getSystemModel();
systemModelType = initializer.getSystemModelType();
Modified: branches/nw-interface/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverFactoryInitializer.java
===================================================================
--- branches/nw-interface/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverFactoryInitializer.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-spi/java/org/mulgara/resolver/spi/ResolverFactoryInitializer.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,13 +28,10 @@
package org.mulgara.resolver.spi;
// Java 2 standard packages
-import java.io.File;
import java.net.URI;
-import java.util.List;
// Third party packages
import org.jrdf.graph.Node;
-import org.jrdf.graph.URIReference;
// Local packages
import org.mulgara.content.ContentHandler;
@@ -61,8 +58,7 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public interface ResolverFactoryInitializer extends FactoryInitializer
-{
+public interface ResolverFactoryInitializer extends FactoryInitializer {
/**
* Register this resolver factory as being able to create and drop models of
* a particular type.
Modified: branches/nw-interface/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-store/java/org/mulgara/resolver/store/StatementStoreResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -31,7 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.net.URI;
-import java.net.URISyntaxException;
// Third party packages
import org.apache.log4j.Logger;
@@ -65,20 +64,10 @@
Logger.getLogger(StatementStoreResolverFactory.class.getName());
// Generate the XA store model type URI
- private static final URI modelTypeURI;
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "Model");
- assert modelTypeURI != null;
- }
- catch (URISyntaxException e) {
- throw new Error("Bad hardcoded XA store model URI", e);
- }
- }
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "Model");
/** The system model. */
private long systemModel;
- private long modelType;
private long rdfType;
/** The underlying transactional graph that backs the generated resolvers. */
@@ -109,8 +98,7 @@
File filePrefix = new File(initializer.getDirectory(), "xa");
statementStore = new XAStatementStoreImpl(filePrefix.toString());
resolverSessionFactory.registerStatementStore(statementStore);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new InitializerException("Couldn't initialize XA store", e);
}
@@ -132,7 +120,6 @@
public void setDatabaseMetadata(DatabaseMetadata metadata) {
rdfType = metadata.getRdfTypeNode();
- modelType = metadata.getSystemModelTypeNode();
systemModel = metadata.getSystemModelNode();
}
@@ -143,8 +130,7 @@
public void close() throws ResolverFactoryException {
try {
statementStore.close();
- }
- catch (StatementStoreException e) {
+ } catch (StatementStoreException e) {
throw new ResolverFactoryException("Unable to close", e);
}
}
@@ -152,8 +138,7 @@
public void delete() throws ResolverFactoryException {
try {
statementStore.delete();
- }
- catch (StatementStoreException e) {
+ } catch (StatementStoreException e) {
throw new ResolverFactoryException("Unable to delete", e);
}
}
@@ -211,8 +196,7 @@
allowWrites
? statementStore.newWritableStatementStore()
: statementStore.newReadOnlyStatementStore());
- }
- catch (ResolverSessionFactoryException er) {
+ } catch (ResolverSessionFactoryException er) {
throw new ResolverFactoryException(
"Failed to obtain a new ResolverSession", er);
}
@@ -233,8 +217,7 @@
(XAResolverSession) resolverSessionFactory.newReadOnlyResolverSession(),
allowWrites ? statementStore.newWritableStatementStore()
: statementStore.newReadOnlyStatementStore());
- }
- catch (ResolverSessionFactoryException er) {
+ } catch (ResolverSessionFactoryException er) {
throw new ResolverFactoryException(
"Failed to obtain a new ResolverSession", er);
}
Modified: branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -37,7 +37,6 @@
// Java 2 standard packages
import java.net.URI;
-import java.net.URISyntaxException;
// Third party packages
import org.apache.log4j.Logger;
@@ -47,7 +46,6 @@
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.*;
-import org.mulgara.server.Session;
/**
* @created 2005-05-03
@@ -61,32 +59,12 @@
*/
public class TestResolverFactory implements ResolverFactory {
/** Logger. */
+ @SuppressWarnings("unused")
private static Logger logger = Logger.getLogger(TestResolverFactory.class.getName());
- private static URI modelTypeURI;
+ private static URI modelTypeURI = URI.create(Mulgara.NAMESPACE + "TestModel");
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE + "TestModel");
- assert modelTypeURI != null;
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded Test model URI", e);
- }
- }
-
- /** The preallocated local node representing the system model */
- private long systemModel;
-
/**
- * The preallocated local node representing the <code>rdf:type</code>
- * property.
- */
- private long rdfType;
-
- /** The preallocated local node representing models stored on the Java heap. */
- private long modelType;
-
- /**
* Construct a local query.
*
* @param resolverFactoryInitializer {@inheritDoc}
@@ -105,12 +83,10 @@
}
// Initialize fields
- rdfType = resolverFactoryInitializer.preallocate(new URIReferenceImpl(RDF.TYPE));
+ resolverFactoryInitializer.preallocate(new URIReferenceImpl(RDF.TYPE));
- modelType = resolverFactoryInitializer.preallocate(new URIReferenceImpl(modelTypeURI));
+ resolverFactoryInitializer.preallocate(new URIReferenceImpl(modelTypeURI));
- systemModel = resolverFactoryInitializer.getSystemModel();
-
// Claim mulgara:TestModel
resolverFactoryInitializer.addModelType(modelTypeURI, this);
Modified: branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-test/java/org/mulgara/resolver/test/TestResolverUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -39,7 +39,6 @@
import java.io.File;
import java.util.*;
import java.net.URI;
-import java.net.URISyntaxException;
// JUnit
import junit.framework.*;
@@ -57,7 +56,6 @@
import org.mulgara.query.UnconstrainedAnswer;
import org.mulgara.query.Variable;
import org.mulgara.query.rdf.LiteralImpl;
-import org.mulgara.query.rdf.Mulgara;
import org.mulgara.resolver.Database;
import org.mulgara.server.Session;
import org.mulgara.transaction.TransactionManagerFactory;
@@ -90,19 +88,9 @@
private static Database database = null;
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
- private static final URI systemModelURI;
- private static final URI modelTypeURI;
+ private static final URI databaseURI = URI.create("local:database");
+ private static final URI systemModelURI = URI.create("local:database#");
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- modelTypeURI = new URI(Mulgara.NAMESPACE + "TestModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
/**
* Named constructor.
@@ -144,7 +132,7 @@
Session session = database.newSession();
Variable[] varArray = new Variable[] { new Variable("a"), new Variable("b") };
- List variables = Arrays.asList(varArray);
+ List<Object> variables = Arrays.asList((Object[])varArray);
Answer answer = session.query(new Query(
variables, // SELECT
@@ -191,7 +179,7 @@
Session session = database.newSession();
Variable[] varArray = new Variable[] { new Variable("a"), new Variable("c") };
- List variables = Arrays.asList(varArray);
+ List<Object> variables = Arrays.asList((Object[])varArray);
Answer answer = session.query(new Query(
variables, // SELECT
@@ -236,7 +224,7 @@
Session session = database.newSession();
Variable[] varArray = new Variable[] { new Variable("a"), new Variable("b"), new Variable("c") };
- List variables = Arrays.asList(varArray);
+ List<Object> variables = Arrays.asList((Object[])varArray);
Answer answer = session.query(new Query(
variables, // SELECT
@@ -287,7 +275,7 @@
Session session = database.newSession();
Variable[] varArray = new Variable[] { new Variable("a"), new Variable("b"), new Variable("c") };
- List variables = Arrays.asList(varArray);
+ List<Object> variables = Arrays.asList((Object[])varArray);
Answer answer = session.query(new Query(
variables, // SELECT
@@ -338,10 +326,10 @@
Session session = database.newSession();
Variable[] varArray = new Variable[] { new Variable("a"), new Variable("b"), new Variable("c") };
- List variables = Arrays.asList(varArray);
+ List<Object> variables = Arrays.asList((Object[])varArray);
try {
- Answer answer = session.query(new Query(
+ session.query(new Query(
variables, // SELECT
new ModelResource(systemModelURI), // FROM
new ConstraintConjunction( // WHERE
Modified: branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverFactory.java
===================================================================
--- branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverFactory.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverFactory.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -28,10 +28,7 @@
package org.mulgara.resolver.view;
// Java 2 standard packages
-import java.io.*;
import java.net.*;
-import java.util.HashSet;
-import java.util.Set;
// Third party packages
import org.apache.log4j.Logger;
@@ -42,9 +39,6 @@
import org.mulgara.query.rdf.Mulgara;
import org.mulgara.query.rdf.URIReferenceImpl;
import org.mulgara.resolver.spi.*;
-import org.mulgara.store.statement.StatementStore;
-import org.mulgara.store.xa.SimpleXAResourceException;
-import org.mulgara.store.xa.XAResolverSessionFactory;
/**
* Resolves constraints in models stored on the Java heap.
@@ -58,13 +52,9 @@
* Software Pty Ltd</a>
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
-public class ViewResolverFactory implements ResolverFactory
-{
- /**
- * Logger.
- */
- private static final Logger logger =
- Logger.getLogger(ViewResolverFactory.class.getName());
+public class ViewResolverFactory implements ResolverFactory {
+ /** Logger. */
+ private static final Logger logger = Logger.getLogger(ViewResolverFactory.class.getName());
/**
* The preallocated local node representing the <code>rdf:type</code>
@@ -81,23 +71,10 @@
private long unionNode;
private long intersectNode;
- /**
- * The preallocated local node representing views.
- */
- private long modelType;
-
/**
* The URL associated with the view type.
*/
- private static final URI modelTypeURI;
- static {
- try {
- modelTypeURI = new URI(Mulgara.NAMESPACE+"ViewModel");
- assert modelTypeURI != null;
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded view model URI", e);
- }
- }
+ private static final URI modelTypeURI = URI.create(Mulgara.NAMESPACE+"ViewModel");
/**
@@ -114,15 +91,13 @@
* Instantiate a {@link ViewResolverFactory}.
*/
private ViewResolverFactory(ResolverFactoryInitializer initializer)
- throws InitializerException
- {
+ throws InitializerException {
// Validate parameters
if (initializer == null) {
throw new IllegalArgumentException(
"Null 'resolverFactoryInitializer' parameter");
}
- modelType = initializer.getSystemModelType();
systemModel = initializer.getSystemModel();
systemModelType = initializer.getSystemModelType();
@@ -157,8 +132,7 @@
* This is actually a non-operation, because there are no persistent
* resources.
*/
- public void close()
- {
+ public void close() {
// null implementation
}
@@ -168,8 +142,7 @@
* This is actually a non-operation, because there are no persistent
* resources.
*/
- public void delete()
- {
+ public void delete() {
// null implementation
}
@@ -183,8 +156,7 @@
* created
*/
public static ResolverFactory newInstance(ResolverFactoryInitializer initializer)
- throws InitializerException
- {
+ throws InitializerException {
return new ViewResolverFactory(initializer);
}
@@ -197,9 +169,9 @@
* <code>null</code>
* @throws ResolverFactoryException {@inheritDoc}
*/
- public Resolver newResolver(boolean canWrite,
- ResolverSession resolverSession, Resolver systemResolver) throws ResolverFactoryException
- {
+ public Resolver newResolver(
+ boolean canWrite, ResolverSession resolverSession, Resolver systemResolver
+ ) throws ResolverFactoryException {
return new ViewResolver(resolverSession,
systemResolver,
rdfType,
Modified: branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java
===================================================================
--- branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/resolver-view/java/org/mulgara/resolver/view/ViewResolverUnitTest.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -40,7 +40,6 @@
// Third party packages
import junit.framework.*; // JUnit
import org.apache.log4j.Logger; // Log4J
-import org.jrdf.vocabulary.RDF; // JRDF
// Locally written packages
import org.mulgara.query.*;
@@ -50,9 +49,6 @@
import org.mulgara.resolver.Database;
import org.mulgara.resolver.TestDef;
import org.mulgara.server.Session;
-import org.mulgara.store.StoreException;
-import org.mulgara.store.nodepool.NodePool;
-import org.mulgara.store.stringpool.StringPool;
import org.mulgara.transaction.TransactionManagerFactory;
import org.mulgara.util.FileUtil;
@@ -61,8 +57,6 @@
*
* @created 2004-04-27
* @author <a href="http://staff.pisoftware.com/raboczi">Simon Raboczi</a>
-* @version $Revision: 1.10 $
-* @modified $Date: 2005/06/26 12:48:13 $ by $Author: pgearon $
* @company <a href="mailto:info at PIsoftware.com">Plugged In Software</a>
* @copyright © 2004 <a href="http://www.PIsoftware.com/">Plugged In
* Software Pty Ltd</a>
@@ -70,30 +64,10 @@
*/
public class ViewResolverUnitTest extends TestCase {
/** The URI of the {@link #database}: <code>local:database</code>. */
- private static final URI databaseURI;
+ private static final URI databaseURI = URI.create("local:database");
- /**
- * The URI of the {@link #database}'s system model:
- * <code>local:database#</code>.
- */
- private static final URI systemModelURI;
-
- /** The URI of the {@link #database}'s system model type. */
- private static final URI memoryModelURI;
-
- static {
- try {
- databaseURI = new URI("local:database");
- systemModelURI = new URI("local:database#");
- memoryModelURI = new URI(Mulgara.NAMESPACE+"MemoryModel");
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded URI", e);
- }
- }
-
/** Logger. */
- private static Logger logger =
- Logger.getLogger(ViewResolverUnitTest.class.getName());
+ private static Logger logger = Logger.getLogger(ViewResolverUnitTest.class.getName());
/**
* In-memory test {@link Database} used to generate {@link Session}s
@@ -600,15 +574,11 @@
database.addResolverFactory("org.mulgara.resolver.url.URLResolverFactory", null);
- try {
- URI modelTypeURI = new URI(Mulgara.NAMESPACE+"Model");
- Session session = database.newSession();
- for (int i = 1; i < modelURIs.length; i++) {
- session.createModel(modelURIs[i], modelTypeURI);
- session.setModel(modelURIs[i], new ModelResource(modelDataURIs[i]));
- }
- } catch (URISyntaxException e) {
- throw new Error("Bad hardcoded XA store model URI", e);
+ URI modelTypeURI = URI.create(Mulgara.NAMESPACE+"Model");
+ Session session = database.newSession();
+ for (int i = 1; i < modelURIs.length; i++) {
+ session.createModel(modelURIs[i], modelTypeURI);
+ session.setModel(modelURIs[i], new ModelResource(modelDataURIs[i]));
}
}
@@ -624,20 +594,20 @@
// Test cases
//
+ @SuppressWarnings("unchecked")
public void testModel() {
try {
logger.warn("Testing: " + test.errorString);
Session session = database.newSession();
try {
- List orderList = new ArrayList();
- Iterator i = test.selectList.iterator();
- while (i.hasNext()) {
- orderList.add(new Order((Variable)i.next(), true));
+ List<Order> orderList = new ArrayList<Order>();
+ for (Variable v: test.selectList) {
+ orderList.add(new Order(v, true));
}
// Evaluate the query
Answer answer = new ArrayAnswer(session.query(new Query(
- test.selectList, // SELECT
+ (List<Object>)(List)test.selectList, // SELECT
test.model, // FROM
test.query, // WHERE
null, // HAVING
@@ -649,7 +619,7 @@
logger.warn("Results Expected in " + test.errorString + " = " + test.results);
logger.warn("Results Received in " + test.errorString + " = " + answer);
- i = test.results.iterator();
+ Iterator<List<Object>> i = test.results.iterator();
answer.beforeFirst();
while (true) {
boolean hasAnswer = answer.next();
@@ -658,10 +628,9 @@
break;
}
assertTrue(test.errorString, hasAnswer && hasResult);
- Iterator j = ((List)i.next()).iterator();
int c = 0;
- while (j.hasNext()) {
- assertEquals(test.errorString, j.next().toString(), answer.getObject(c++).toString());
+ for (Object obj: i.next()) {
+ assertEquals(test.errorString, obj.toString(), answer.getObject(c++).toString());
}
}
} finally {
@@ -679,6 +648,7 @@
/**
* Fail with an unexpected exception
*/
+ @SuppressWarnings("unused")
private void fail(Throwable throwable) {
fail(null, throwable);
}
Modified: branches/nw-interface/src/jar/sofa/java/org/mulgara/sofa/example/CameraPhoneOntologyApp.java
===================================================================
--- branches/nw-interface/src/jar/sofa/java/org/mulgara/sofa/example/CameraPhoneOntologyApp.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/sofa/java/org/mulgara/sofa/example/CameraPhoneOntologyApp.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -74,6 +74,7 @@
* @param onto Ontology
* @throws Exception
*/
+ @SuppressWarnings("unchecked")
public void loadCameraOntology(Ontology onto) throws Exception {
System.out.println("Loading Camera Ontology");
@@ -90,7 +91,7 @@
Concept phone = onto.createConcept("Phone");
// give it a property/relation of GSM or CDMA
Relation standard = onto.createRelation("standard");
- Set standards = new HashSet();
+ Set<String> standards = new HashSet<String>();
standards.add("GSM");
standards.add("CDMA");
phone.setRestrictionOn(standard, standards, 1, 2); // 1=minCard, 2=maxCard
@@ -106,30 +107,24 @@
// Show super classes
System.out.println("SUPER CLASSES");
- Concept superConcept = null;
- Collection superConcepts = cameraPhone.getSuperConcepts(true);
+ Collection<Concept> superConcepts = cameraPhone.getSuperConcepts(true);
// show number of superclasses
- System.out
- .println("Number of superConcepts found: " + superConcepts.size());
+ System.out.println("Number of superConcepts found: " + superConcepts.size());
// test a phone is our superclass
System.out.println("Found phone concept in list of super concepts: "
+ superConcepts.contains(phone));
- for (Iterator sc = superConcepts.iterator(); sc.hasNext();) {
- superConcept = (Concept) sc.next();
-
- System.out.println(superConcept.getId());
+ for (Concept sc: superConcepts) {
+ System.out.println(sc.getId());
}
// show properties, including super properties 'true'
System.out.println("PROPERTIES");
- for (Iterator ri = cameraPhone.definedRelations(true); ri.hasNext();) {
- Relation relation = (Relation) ri.next();
-
- System.out.println(relation.getId());
+ for (Iterator<Relation> ri = cameraPhone.definedRelations(true); ri.hasNext();) {
+ System.out.println(ri.next().getId());
}
// test camera phones have 'standard'
@@ -146,6 +141,7 @@
* @param ontology Ontology
* @throws Exception
*/
+ @SuppressWarnings("unchecked")
public void populateOntology(Ontology ontology) throws Exception {
// Retrieve the CameraPhone concept
@@ -176,39 +172,32 @@
System.out.println("Listing standards for mobile phone:");
// Iterate through the standards of the phone
- for (Iterator iterator = mobile.list(standardRelation).iterator(); iterator
- .hasNext();) {
-
+ for (Object obj: mobile.list(standardRelation)) {
// Print the next standard
- System.out.println(iterator.next());
+ System.out.println(obj);
}
System.out.println("Listing lenses for mobile phone:");
// Iterate through the lenses of the phone
- for (Iterator iterator = mobile.list(lensRelation).iterator(); iterator
- .hasNext();) {
-
+ for (Object obj: mobile.list(lensRelation)) {
// Print the next lens
- System.out.println(iterator.next());
+ System.out.println(obj);
}
System.out.println("Listing lenses for camera:");
// Iterate through the lenses of the camera
- for (Iterator iterator = camera.list(lensRelation).iterator(); iterator
- .hasNext();) {
-
+ for (Object obj: camera.list(lensRelation)) {
// Print the next lens
- System.out.println(iterator.next());
+ System.out.println(obj);
}
System.out.println("All Things:");
// Iterate through all 'Things' in the ontology framework
- for (Iterator iterator = ontology.things(); iterator.hasNext();) {
-
- System.out.println("\t" + ((Thing) iterator.next()).getId());
+ for (Iterator<Thing> thing = ontology.things(); thing.hasNext();) {
+ System.out.println("\t" + (thing.next()).getId());
}
}
@@ -267,7 +256,7 @@
if (session.modelExists(graph)) {
session.removeModel(graph);
}
- session.createModel(graph, new URI(Mulgara.NAMESPACE + "Model"));
+ session.createModel(graph, URI.create(Mulgara.NAMESPACE + "Model"));
return JRDFGraphFactory.newClientGraph(getServerURI(), graph);
}
Modified: branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java
===================================================================
--- branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/AbstractTuples.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -61,36 +61,23 @@
* @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
*/
public abstract class AbstractTuples implements Tuples {
- /**
- * Logger.
- */
- private static Logger logger =
- Logger.getLogger(AbstractTuples.class.getName());
+ /** Logger. */
+ @SuppressWarnings("unused")
+ private static Logger logger = Logger.getLogger(AbstractTuples.class.getName());
- /**
- * Empty variable array.
- */
+ /** Empty variable array. */
private final static Variable[] emptyVariables = new Variable[] {};
- /**
- * Description of the Field
- */
+ /** Description of the Field */
private final static long[] NO_PREFIX = new long[] {};
- /**
- * Description of the Field
- */
- private final static RowComparator defaultRowComparator =
- new DefaultRowComparator();
+ /** Description of the Field */
+ private final static RowComparator defaultRowComparator = new DefaultRowComparator();
- /**
- * The variable names of each column.
- */
+ /** The variable names of each column. */
private Variable[] variables = null;
- /**
- * Cache the row count when calculated.
- */
+ /** Cache the row count when calculated. */
protected long rowCount = -1;
protected int rowCardinality = -1;
@@ -248,8 +235,7 @@
if (variables != null) {
newVariables = new Variable[variables.length];
System.arraycopy(variables, 0, newVariables, 0, variables.length);
- }
- else {
+ } else {
newVariables = emptyVariables;
}
@@ -280,8 +266,7 @@
public long getRowCount() throws TuplesException {
if (rowCount != -1) {
return rowCount;
- }
- else if (isMaterialized()) {
+ } else if (isMaterialized()) {
return getRowUpperBound(); // Upper bound is accurate if tuples is materialized.
}
Tuples temp = (Tuples)this.clone();
@@ -298,14 +283,11 @@
public abstract long getRowUpperBound() throws TuplesException;
public int getRowCardinality() throws TuplesException {
- if (rowCardinality != -1) {
- return rowCardinality;
- }
+ if (rowCardinality != -1) return rowCardinality;
if (rowCount > 1) {
rowCardinality = Cursor.MANY;
- }
- else {
+ } else {
switch ((int) rowCount) {
case 0:
rowCardinality = Cursor.ZERO;
@@ -319,12 +301,10 @@
if (!temp.next()) {
rowCount = 0;
rowCardinality = Cursor.ZERO;
- }
- else if (!temp.next()) {
+ } else if (!temp.next()) {
rowCount = 1;
rowCardinality = Cursor.ONE;
- }
- else {
+ } else {
rowCardinality = Cursor.MANY;
}
temp.close();
@@ -362,17 +342,14 @@
Variable[] variables = getVariables();
for (int i = 0; i < variables.length; i++) {
- if (variables[i].equals(variable)) {
- return i;
- }
+ if (variables[i].equals(variable)) return i;
}
throw new TuplesException("No such variable " + variable + " in tuples " +
Arrays.asList(variables) + " (" + getClass() + ")");
}
- public abstract boolean isColumnEverUnbound(int column)
- throws TuplesException;
+ public abstract boolean isColumnEverUnbound(int column) throws TuplesException;
/**
* Gets the Materialized attribute of the AbstractTuples object
@@ -417,8 +394,7 @@
* @throws IllegalArgumentException if <var>prefix</var> is <code>null</code>
* @throws TuplesException EXCEPTION TO DO
*/
- public abstract void beforeFirst(long[] prefix, int suffixTruncation)
- throws TuplesException;
+ public abstract void beforeFirst(long[] prefix, int suffixTruncation) throws TuplesException;
/**
* Convenience method for the usual case of wanting to reset a tuples to
@@ -478,15 +454,14 @@
}
/**
- * METHOD TO DO
+ * Clone this tuples.
*
- * @return RETURNED VALUE TO DO
+ * @return A new instance euqivalent to the current Tuples.
*/
public Object clone() {
try {
return super.clone();
- }
- catch (CloneNotSupportedException e) {
+ } catch (CloneNotSupportedException e) {
throw new Error(getClass() + " doesn't support clone, which it must", e);
}
}
@@ -547,18 +522,15 @@
}
isEqual = tuplesEqual;
- }
- finally {
+ } finally {
t1.close();
t2.close();
}
}
}
- }
- catch (ClassCastException cce) {
+ } catch (ClassCastException cce) {
// Not of the correct type return false.
- }
- catch (TuplesException ex) {
+ } catch (TuplesException ex) {
throw new RuntimeException(ex.toString(), ex);
}
}
@@ -567,9 +539,9 @@
}
/**
- * METHOD TO DO
+ * Output the contents of this tuples in a string.
*
- * @return RETURNED VALUE TO DO
+ * @return The string representing the tuples.
*/
public String toString() {
return SimpleTuplesFormat.format(this);
@@ -580,9 +552,8 @@
*
* @param variableList the list containing variables.
*/
- protected void setVariables(List variableList) {
- variables =
- (Variable[]) variableList.toArray(new Variable[variableList.size()]);
+ protected void setVariables(List<Variable> variableList) {
+ variables = variableList.toArray(new Variable[variableList.size()]);
}
/**
@@ -594,7 +565,7 @@
variables = variableArray;
}
- public Annotation getAnnotation(Class annotationClass) throws TuplesException {
+ public Annotation getAnnotation(Class<?> annotationClass) throws TuplesException {
return null;
}
}
Modified: branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java
===================================================================
--- branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java 2007-09-28 19:04:48 UTC (rev 459)
+++ branches/nw-interface/src/jar/tuples/java/org/mulgara/store/tuples/Tuples.java 2007-09-28 19:06:27 UTC (rev 460)
@@ -182,7 +182,7 @@
* Be aware that the tuples returned from this method are not cloned, and should
* be considered immutable.
*/
- public List getOperands();
+ public List<Tuples> getOperands();
/**
* Move the cursor to before the first row, optionally with a specifies list
@@ -268,5 +268,5 @@
*
* @return An annotation of the class requested, or null if none exists.
*/
- public Annotation getAnnotation(Class annotationClass) throws TuplesException;
+ public Annotation getAnnotation(Class<?> annotationClass) throws TuplesException;
}
More information about the Mulgara-svn
mailing list