You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2012/06/26 00:51:22 UTC
svn commit: r1353772 - in
/jena/Experimental/jena-client/src/main/java/org/apache/jena/client:
Parameterizer.java ParameterizerBase.java
Author: sallen
Date: Mon Jun 25 22:51:21 2012
New Revision: 1353772
URL: http://svn.apache.org/viewvc?rev=1353772&view=rev
Log:
jena-client - Tighten up the contract of Parameterizer to disallow null parameters for the .set*() methods.
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Parameterizer.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ParameterizerBase.java
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Parameterizer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Parameterizer.java?rev=1353772&r1=1353771&r2=1353772&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Parameterizer.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Parameterizer.java Mon Jun 25 22:51:21 2012
@@ -31,9 +31,6 @@ interface Parameterizer
* Sets a Parameter
* @param var Variable
* @param node Value
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setParam(String var, Node node);
@@ -41,19 +38,13 @@ interface Parameterizer
* Sets a Parameter
* @param var Variable
* @param node Value
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setParam(String var, RDFNode node);
/**
* Sets a Parameter to a URI
* @param var Variable
- * @param uri URI
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
+ * @param uri URI
*/
void setUri(String var, String uri);
@@ -61,29 +52,20 @@ interface Parameterizer
* Sets a Parameter to a URI
* @param var Variable
* @param uri URI
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setUri(String var, URI uri);
/**
* Sets a Parameter to an IRI
* @param var Variable
- * @param iri IRI
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
+ * @param iri IRI
*/
void setUri(String var, IRI iri);
/**
* Sets a Parameter to a URI
* @param var Variable
- * @param url URL used a URI
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
+ * @param url URL used a URI
*/
void setUri(String var, URL url);
@@ -91,9 +73,6 @@ interface Parameterizer
* Sets a Parameter to a Literal
* @param var Variable
* @param lit Value
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setLiteral(String var, Literal lit);
@@ -101,9 +80,6 @@ interface Parameterizer
* Set a Parameter to a literal
* @param var Variable
* @param value Lexical Value
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setLiteral(String var, String value);
@@ -112,9 +88,6 @@ interface Parameterizer
* @param var Variable
* @param value Lexical Value
* @param lang Language
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setLiteral(String var, String value, String lang);
@@ -123,9 +96,6 @@ interface Parameterizer
* @param var Variable
* @param value Lexical Value
* @param datatype Datatype
- * <p>
- * Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
- * </p>
*/
void setLiteral(String var, String value, RDFDatatype datatype);
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ParameterizerBase.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ParameterizerBase.java?rev=1353772&r1=1353771&r2=1353772&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ParameterizerBase.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ParameterizerBase.java Mon Jun 25 22:51:21 2012
@@ -79,69 +79,73 @@ abstract class ParameterizerBase impleme
@Override
public void setParam(String var, Node node)
{
- if (var == null) throw new IllegalArgumentException("var cannot be null");
+ if (var == null) throw new NullPointerException("var");
+ if (node == null) throw new NullPointerException("node");
+
if (var.startsWith("?") || var.startsWith("$")) var = var.substring(1);
- if (node != null)
- {
- params.put(var, node);
- }
- else
- {
- clearParam(var);
- }
+ params.put(var, node);
}
@Override
public void setParam(String var, RDFNode node)
{
+ if (node == null) throw new NullPointerException("node");
setParam(var, node.asNode());
}
@Override
public void setUri(String var, String uri)
{
+ if (uri == null) throw new NullPointerException("uri");
setParam(var, Node.createURI(uri));
}
@Override
public void setUri(String var, URI uri)
{
+ if (uri == null) throw new NullPointerException("uri");
setUri(var, uri.toString());
}
@Override
public void setUri(String var, IRI iri)
{
+ if (iri == null) throw new NullPointerException("iri");
setUri(var, iri.toString());
}
@Override
public void setUri(String var, URL url)
{
+ if (url == null) throw new NullPointerException("url");
setUri(var, url.toString());
}
@Override
public void setLiteral(String var, Literal lit)
{
+ if (lit == null) throw new NullPointerException("lit");
setParam(var, lit);
}
@Override
public void setLiteral(String var, String value)
{
+ if (value == null) throw new NullPointerException("value");
setParam(var, Node.createLiteral(value));
}
@Override
public void setLiteral(String var, String value, String lang)
{
+ if (value == null) throw new NullPointerException("value");
setParam(var, NodeFactory.createLiteralNode(value, lang, null));
}
@Override
public void setLiteral(String var, String value, RDFDatatype datatype)
{
+ if (value == null) throw new NullPointerException("value");
setParam(var, Node.createLiteral(value, datatype));
}
@@ -178,6 +182,8 @@ abstract class ParameterizerBase impleme
@Override
public void setLiteral(String var, Calendar dt)
{
+ if (dt == null) throw new NullPointerException("dt");
+
Object value = new XSDDateTime(dt);
LiteralLabel ll = LiteralLabelFactory.create(value, "", XSDDatatype.XSDdateTime);
setParam(var, Node.createLiteral(ll));