You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/04/01 18:54:08 UTC
svn commit: r1463205 - in /jena/Experimental/jena-jdbc:
jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/
jena-jdbc-core/src/test/java/org/apache/jena/jdbc/
jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/
Author: rvesse
Date: Mon Apr 1 16:54:08 2013
New Revision: 1463205
URL: http://svn.apache.org/r1463205
Log:
Clean up warnings
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/AskResults.java
jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaJdbcConnectionTests.java
jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/AskResults.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/AskResults.java?rev=1463205&r1=1463204&r2=1463205&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/AskResults.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/AskResults.java Mon Apr 1 16:54:08 2013
@@ -28,6 +28,7 @@ import org.apache.jena.jdbc.results.meta
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory;
/**
* Represents an ASK result
@@ -183,7 +184,7 @@ public class AskResults extends JenaJdbc
if (this.isClosed()) throw new SQLException("Result Set is closed");
if (this.currRow != 1) throw new SQLException("Not currently at a row");
if (AskResultsMetadata.COLUMN_LABEL_ASK.equals(columnLabel)) {
- return Node.createLiteral(Boolean.toString(this.result), XSDDatatype.XSDboolean);
+ return NodeFactory.createLiteral(Boolean.toString(this.result), XSDDatatype.XSDboolean);
} else {
throw new SQLException("The given column does not exist in the result set");
}
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaJdbcConnectionTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaJdbcConnectionTests.java?rev=1463205&r1=1463204&r2=1463205&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaJdbcConnectionTests.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaJdbcConnectionTests.java Mon Apr 1 16:54:08 2013
@@ -24,7 +24,7 @@ import java.sql.Statement;
import org.junit.Assert;
import org.junit.Test;
-import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.DatasetFactory;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -121,7 +121,7 @@ public abstract class AbstractJenaJdbcCo
public void connection_statement_query_02() throws SQLException {
// Prepare a dataset
Dataset ds = DatasetFactory.createMem();
- ds.asDatasetGraph().add(new Quad(Node.createURI("http://graph"), Node.createURI("http://subject"), Node.createURI("http://predicate"), Node.createURI("http://object")));
+ ds.asDatasetGraph().add(new Quad(NodeFactory.createURI("http://graph"), NodeFactory.createURI("http://subject"), NodeFactory.createURI("http://predicate"), NodeFactory.createURI("http://object")));
// Work with the connection
JenaJdbcConnection conn = this.getConnection(ds);
Modified: jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java?rev=1463205&r1=1463204&r2=1463205&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java Mon Apr 1 16:54:08 2013
@@ -27,7 +27,6 @@ import org.apache.jena.jdbc.JenaJdbcDriv
import org.apache.jena.jdbc.mem.JenaJdbcDatasetConnection;
import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
import com.hp.hpl.jena.tdb.TDBFactory;
/**
@@ -58,10 +57,19 @@ public class TDBDriver extends JenaJdbcD
*/
public static final String TDB_DRIVER_PREFIX = "tdb:";
+ /**
+ * Constant for driver parameter that sets the location of the TDB dataset
+ */
public static final String PARAM_LOCATION = "location";
+ /**
+ * Constant for driver parameter that sets whether the TDB dataset must already exist
+ */
public static final String PARAM_MUST_EXIST = "must-exist";
+ /**
+ * Constant for driver parameter that sets that the TDB dataset is used in transactional mode
+ */
public static final String PARAM_TRANSACTIONAL = "transactional";
/**
@@ -86,9 +94,13 @@ public class TDBDriver extends JenaJdbcD
// Open the TDB dataset
Dataset tdb = TDBFactory.createDataset(location);
- // TODO If transactional is set use the dataset in transactional mode - needs a Transactional connection instance
- // Return a JenaJdbcDatasetConnection for the TDB dataset
- return (Connection) new JenaJdbcDatasetConnection(tdb, JenaJdbcConnection.DEFAULT_HOLDABILITY);
+ if ("true".equals(transactional)) {
+ // TODO If transactional is set use the dataset in transactional mode - needs a Transactional connection instance
+ throw new SQLException("Transactional usage of TDB not yet supported by the Jena JDBC driver");
+ } else {
+ // Return a JenaJdbcDatasetConnection for the TDB dataset
+ return (Connection) new JenaJdbcDatasetConnection(tdb, JenaJdbcConnection.DEFAULT_HOLDABILITY);
+ }
}