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/06/03 22:13:47 UTC
svn commit: r1489146 - in
/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc:
results/JenaResultSet.java statements/JenaPreparedStatement.java
Author: rvesse
Date: Mon Jun 3 20:13:47 2013
New Revision: 1489146
URL: http://svn.apache.org/r1489146
Log:
Adjustments for renamed class
Modified:
jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaPreparedStatement.java
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java?rev=1489146&r1=1489145&r2=1489146&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java Mon Jun 3 20:13:47 2013
@@ -45,7 +45,7 @@ import java.util.Map;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.statements.JenaStatement;
-import org.apache.jena.jdbc.utils.JenaJdbcNodeUtils;
+import org.apache.jena.jdbc.utils.JdbcNodeUtils;
import com.hp.hpl.jena.graph.Node;
@@ -195,7 +195,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a decimal
this.setNull(false);
- return JenaJdbcNodeUtils.toDecimal(n);
+ return JdbcNodeUtils.toDecimal(n);
}
}
@@ -213,7 +213,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a boolean
this.setNull(false);
- return JenaJdbcNodeUtils.toBoolean(n);
+ return JdbcNodeUtils.toBoolean(n);
}
}
@@ -231,7 +231,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a byte
this.setNull(false);
- return JenaJdbcNodeUtils.toByte(n);
+ return JdbcNodeUtils.toByte(n);
}
}
@@ -249,7 +249,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a date
this.setNull(false);
- return JenaJdbcNodeUtils.toDate(n);
+ return JdbcNodeUtils.toDate(n);
}
}
@@ -267,7 +267,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a date
this.setNull(false);
- return JenaJdbcNodeUtils.toDouble(n);
+ return JdbcNodeUtils.toDouble(n);
}
}
@@ -285,7 +285,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a date
this.setNull(false);
- return JenaJdbcNodeUtils.toFloat(n);
+ return JdbcNodeUtils.toFloat(n);
}
}
@@ -303,7 +303,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into an integer
this.setNull(false);
- return JenaJdbcNodeUtils.toInt(n);
+ return JdbcNodeUtils.toInt(n);
}
}
@@ -321,7 +321,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into an integer
this.setNull(false);
- return JenaJdbcNodeUtils.toLong(n);
+ return JdbcNodeUtils.toLong(n);
}
}
@@ -338,7 +338,7 @@ public abstract class JenaResultSet impl
return null;
} else {
this.setNull(false);
- return JenaJdbcNodeUtils.toString(n);
+ return JdbcNodeUtils.toString(n);
}
}
@@ -386,31 +386,31 @@ public abstract class JenaResultSet impl
case Types.VARCHAR:
throw new SQLException("Unable to marhsal a RDF Node to the declared column type " + jdbcType);
case Types.BOOLEAN:
- return JenaJdbcNodeUtils.toBoolean(n);
+ return JdbcNodeUtils.toBoolean(n);
case Types.BIGINT:
- return JenaJdbcNodeUtils.toLong(n);
+ return JdbcNodeUtils.toLong(n);
case Types.DATE:
- return JenaJdbcNodeUtils.toDate(n);
+ return JdbcNodeUtils.toDate(n);
case Types.DECIMAL:
- return JenaJdbcNodeUtils.toDecimal(n);
+ return JdbcNodeUtils.toDecimal(n);
case Types.DOUBLE:
- return JenaJdbcNodeUtils.toDouble(n);
+ return JdbcNodeUtils.toDouble(n);
case Types.FLOAT:
- return JenaJdbcNodeUtils.toFloat(n);
+ return JdbcNodeUtils.toFloat(n);
case Types.INTEGER:
- return JenaJdbcNodeUtils.toInt(n);
+ return JdbcNodeUtils.toInt(n);
case Types.JAVA_OBJECT:
return n;
case Types.NVARCHAR:
- return JenaJdbcNodeUtils.toString(n);
+ return JdbcNodeUtils.toString(n);
case Types.SMALLINT:
- return JenaJdbcNodeUtils.toShort(n);
+ return JdbcNodeUtils.toShort(n);
case Types.TIME:
- return JenaJdbcNodeUtils.toTime(n);
+ return JdbcNodeUtils.toTime(n);
case Types.TIMESTAMP:
- return JenaJdbcNodeUtils.toTimestamp(n);
+ return JdbcNodeUtils.toTimestamp(n);
case Types.TINYINT:
- return JenaJdbcNodeUtils.toByte(n);
+ return JdbcNodeUtils.toByte(n);
default:
throw new SQLException("Unable to marshal a RDF Node to the declared unknown column type " + jdbcType);
}
@@ -431,7 +431,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into an integer
this.setNull(false);
- return JenaJdbcNodeUtils.toShort(n);
+ return JdbcNodeUtils.toShort(n);
}
}
@@ -448,7 +448,7 @@ public abstract class JenaResultSet impl
return null;
} else {
this.setNull(false);
- return JenaJdbcNodeUtils.toString(n);
+ return JdbcNodeUtils.toString(n);
}
}
@@ -466,7 +466,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a time
this.setNull(false);
- return JenaJdbcNodeUtils.toTime(n);
+ return JdbcNodeUtils.toTime(n);
}
}
@@ -484,7 +484,7 @@ public abstract class JenaResultSet impl
} else {
// Try to marshal into a timestamp
this.setNull(false);
- return JenaJdbcNodeUtils.toTimestamp(n);
+ return JdbcNodeUtils.toTimestamp(n);
}
}
@@ -501,7 +501,7 @@ public abstract class JenaResultSet impl
return null;
} else {
this.setNull(false);
- return JenaJdbcNodeUtils.toURL(n);
+ return JdbcNodeUtils.toURL(n);
}
}
Modified: jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaPreparedStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaPreparedStatement.java?rev=1489146&r1=1489145&r2=1489146&view=diff
==============================================================================
--- jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaPreparedStatement.java (original)
+++ jena/Experimental/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaPreparedStatement.java Mon Jun 3 20:13:47 2013
@@ -46,7 +46,7 @@ import java.util.TimeZone;
import org.apache.jena.iri.IRI;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.statements.metadata.JenaParameterMetadata;
-import org.apache.jena.jdbc.utils.JenaJdbcNodeUtils;
+import org.apache.jena.jdbc.utils.JdbcNodeUtils;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.graph.Node;
@@ -399,7 +399,7 @@ public abstract class JenaPreparedStatem
} else if (value instanceof Byte) {
this.setParameter(parameterIndex, NodeFactoryExtra.intToNode((long)(Byte)value));
} else if (value instanceof Node) {
- long l = JenaJdbcNodeUtils.toLong((Node) value);
+ long l = JdbcNodeUtils.toLong((Node) value);
this.setParameter(parameterIndex, NodeFactoryExtra.intToNode(l));
} else if (value instanceof String) {
this.setParameter(parameterIndex, NodeFactoryExtra.intToNode(Long.parseLong((String)value)));
@@ -412,7 +412,7 @@ public abstract class JenaPreparedStatem
this.setParameter(parameterIndex,
NodeFactory.createLiteral(Boolean.toString((Boolean) value), XSDDatatype.XSDboolean));
} else if (value instanceof Node) {
- boolean b = JenaJdbcNodeUtils.toBoolean((Node) value);
+ boolean b = JdbcNodeUtils.toBoolean((Node) value);
this.setParameter(parameterIndex,
NodeFactory.createLiteral(Boolean.toString(b), XSDDatatype.XSDboolean));
} else if (value instanceof String) {
@@ -428,7 +428,7 @@ public abstract class JenaPreparedStatem
this.setParameter(parameterIndex, NodeFactoryExtra.dateTimeToNode(c));
} else if (value instanceof Node) {
Calendar c = Calendar.getInstance();
- c.setTimeInMillis(JenaJdbcNodeUtils.toDate((Node)value).getTime());
+ c.setTimeInMillis(JdbcNodeUtils.toDate((Node)value).getTime());
this.setParameter(parameterIndex, NodeFactoryExtra.dateTimeToNode(c));
} else if (value instanceof Time) {
Calendar c = Calendar.getInstance();
@@ -444,7 +444,7 @@ public abstract class JenaPreparedStatem
if (value instanceof BigDecimal) {
this.setParameter(parameterIndex, NodeFactory.createLiteral(((BigDecimal)value).toPlainString(), XSDDatatype.XSDdecimal));
} else if (value instanceof Node) {
- BigDecimal d = JenaJdbcNodeUtils.toDecimal((Node)value);
+ BigDecimal d = JdbcNodeUtils.toDecimal((Node)value);
this.setParameter(parameterIndex, NodeFactory.createLiteral(d.toPlainString(), XSDDatatype.XSDdecimal));
} else {
throw new SQLException("The given value is not marshallable to the desired target type");
@@ -456,7 +456,7 @@ public abstract class JenaPreparedStatem
} else if (value instanceof Float) {
this.setParameter(parameterIndex, NodeFactoryExtra.doubleToNode((double)(Float)value));
} else if (value instanceof Node) {
- Double d = JenaJdbcNodeUtils.toDouble((Node)value);
+ Double d = JdbcNodeUtils.toDouble((Node)value);
this.setParameter(parameterIndex, NodeFactoryExtra.doubleToNode(d));
} else {
throw new SQLException("The given value is not marshallable to the desired target type");
@@ -466,7 +466,7 @@ public abstract class JenaPreparedStatem
if (value instanceof Float) {
this.setParameter(parameterIndex, NodeFactoryExtra.floatToNode((Float)value));
} else if (value instanceof Node) {
- Float f = JenaJdbcNodeUtils.toFloat((Node)value);
+ Float f = JdbcNodeUtils.toFloat((Node)value);
this.setParameter(parameterIndex, NodeFactoryExtra.floatToNode(f));
} else {
throw new SQLException("The given value is not marshallable to the desired target type");
@@ -476,7 +476,7 @@ public abstract class JenaPreparedStatem
if (value instanceof Integer || value instanceof Short || value instanceof Byte) {
this.setParameter(parameterIndex, NodeFactoryExtra.intToNode((Integer)value));
} else if (value instanceof Node) {
- Integer i = JenaJdbcNodeUtils.toInt((Node)value);
+ Integer i = JdbcNodeUtils.toInt((Node)value);
this.setParameter(parameterIndex, NodeFactoryExtra.intToNode(i));
} else {
throw new SQLException("The given value is not marshallable to the desired target type");
@@ -533,7 +533,7 @@ public abstract class JenaPreparedStatem
} else if (value instanceof Byte) {
this.setParameter(parameterIndex, NodeFactory.createLiteral(Short.toString((short)(Byte)value), XSDDatatype.XSDshort));
} else if (value instanceof Node) {
- Short s = JenaJdbcNodeUtils.toShort((Node)value);
+ Short s = JdbcNodeUtils.toShort((Node)value);
this.setParameter(parameterIndex, NodeFactory.createLiteral(Short.toString(s), XSDDatatype.XSDshort));
} else if (value instanceof String) {
this.setParameter(parameterIndex, NodeFactory.createLiteral(Short.toString(Short.parseShort((String)value)), XSDDatatype.XSDshort));
@@ -548,7 +548,7 @@ public abstract class JenaPreparedStatem
this.setParameter(parameterIndex, NodeFactoryExtra.timeToNode(c));
} else if (value instanceof Node) {
Calendar c = Calendar.getInstance();
- c.setTimeInMillis(JenaJdbcNodeUtils.toDate((Node)value).getTime());
+ c.setTimeInMillis(JdbcNodeUtils.toDate((Node)value).getTime());
this.setParameter(parameterIndex, NodeFactoryExtra.timeToNode(c));
} else if (value instanceof Date) {
Calendar c = Calendar.getInstance();
@@ -565,7 +565,7 @@ public abstract class JenaPreparedStatem
Byte b = (Byte)value;
this.setParameter(parameterIndex, NodeFactory.createLiteral(Byte.toString(b), XSDDatatype.XSDbyte));
} else if (value instanceof Node) {
- Byte b = JenaJdbcNodeUtils.toByte((Node)value);
+ Byte b = JdbcNodeUtils.toByte((Node)value);
this.setParameter(parameterIndex, NodeFactory.createLiteral(Byte.toString(b), XSDDatatype.XSDbyte));
} else {
throw new SQLException("The given value is not marshallable to the desired type");