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/05/22 03:27:04 UTC
svn commit: r1341285 - in
/jena/Experimental/jena-client/src/main/java/org/apache/jena/client:
Parameterizer.java ParameterizerBase.java RepositoryFactory.java
graph/DatasetGraphQueryStatement.java http/HttpQueryStatement.java
http/UpdateRemote.java
Author: sallen
Date: Tue May 22 01:27:04 2012
New Revision: 1341285
URL: http://svn.apache.org/viewvc?rev=1341285&view=rev
Log:
jena-client Added RepositoryFactory and changed Parameterizer.setIri() to setUri().
Added:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/RepositoryFactory.java
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
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.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=1341285&r1=1341284&r2=1341285&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 Tue May 22 01:27:04 2012
@@ -1,5 +1,6 @@
package org.apache.jena.client;
+import java.net.URI;
import java.net.URL;
import java.util.Calendar;
@@ -47,14 +48,24 @@ interface Parameterizer
void setParam(String var, RDFNode node);
/**
- * Sets a Parameter to an IRI
+ * Sets a Parameter to a URI
* @param var Variable
- * @param iri IRI
+ * @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, String uri);
+
+ /**
+ * 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 setIri(String var, String iri);
+ void setUri(String var, URI uri);
/**
* Sets a Parameter to an IRI
@@ -64,17 +75,17 @@ interface Parameterizer
* Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
* </p>
*/
- void setIri(String var, IRI iri);
+ void setUri(String var, IRI iri);
/**
- * Sets a Parameter to an IRI
+ * Sets a Parameter to a URI
* @param var Variable
- * @param url URL used as IRI
+ * @param url URL used a URI
* <p>
* Setting a parameter to null is equivalent to calling {@link #clearParam(String)} for the given variable
* </p>
*/
- void setIri(String var, URL url);
+ void setUri(String var, URL url);
/**
* Sets a Parameter to a Literal
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=1341285&r1=1341284&r2=1341285&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 Tue May 22 01:27:04 2012
@@ -1,9 +1,11 @@
package org.apache.jena.client;
+import java.net.URI;
import java.net.URL;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.jena.iri.IRI;
@@ -51,7 +53,7 @@ abstract class ParameterizerBase impleme
{
// TODO Grabbed this from Rob's ParameterizedSparqlString class, doesn't limit itself to only variables (which is bad)...
Pattern p = Pattern.compile("([?$]" + entry.getKey() + ")([^\\w]|$)");
- toReturn = p.matcher(toReturn).replaceAll(FmtUtils.stringForNode(entry.getValue(), context) + "$2");
+ toReturn = p.matcher(toReturn).replaceAll(Matcher.quoteReplacement(FmtUtils.stringForNode(entry.getValue(), context)) + "$2");
}
return toReturn;
@@ -96,21 +98,27 @@ abstract class ParameterizerBase impleme
}
@Override
- public void setIri(String var, String iri)
+ public void setUri(String var, String uri)
{
- setParam(var, Node.createURI(iri));
+ setParam(var, Node.createURI(uri));
+ }
+
+ @Override
+ public void setUri(String var, URI uri)
+ {
+ setUri(var, uri.toString());
}
@Override
- public void setIri(String var, IRI iri)
+ public void setUri(String var, IRI iri)
{
- setIri(var, iri.toString());
+ setUri(var, iri.toString());
}
@Override
- public void setIri(String var, URL url)
+ public void setUri(String var, URL url)
{
- setIri(var, url.toString());
+ setUri(var, url.toString());
}
@Override
Added: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/RepositoryFactory.java?rev=1341285&view=auto
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/RepositoryFactory.java (added)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/RepositoryFactory.java Tue May 22 01:27:04 2012
@@ -0,0 +1,19 @@
+package org.apache.jena.client;
+
+import org.apache.jena.client.graph.DatasetGraphRepository;
+import org.apache.jena.client.http.HttpRepository;
+
+import com.hp.hpl.jena.sparql.core.DatasetGraph;
+
+public class RepositoryFactory
+{
+ public static Repository createLocal(DatasetGraph dsg)
+ {
+ return new DatasetGraphRepository(dsg);
+ }
+
+ public static Repository createRemote(String queryEndpoint, String updateEndpoint)
+ {
+ return new HttpRepository(queryEndpoint, updateEndpoint);
+ }
+}
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java?rev=1341285&r1=1341284&r2=1341285&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java Tue May 22 01:27:04 2012
@@ -29,7 +29,7 @@ class DatasetGraphQueryStatement extends
private QueryExecution createQueryExecution()
{
// TODO Handle Query object in addition to QueryString
- String sparql = buildFromString(queryString, null);
+ String sparql = toString();
QueryExecution qe = QueryExecutionFactory.create(sparql, DatasetImpl.wrap(queryService.getDatasetGraph()));
// TODO Set the options on qe, such as timeouts
synchronized (lock)
@@ -75,4 +75,8 @@ class DatasetGraphQueryStatement extends
}
}
+ public String toString()
+ {
+ return buildFromString(queryString, null);
+ }
}
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java?rev=1341285&r1=1341284&r2=1341285&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java Tue May 22 01:27:04 2012
@@ -24,7 +24,7 @@ class HttpQueryStatement extends QuerySt
private QueryEngineHTTP createQueryExecution()
{
// TODO Handle Query object in addition to QueryString
- String sparql = buildFromString(queryString, null);
+ String sparql = toString();
QueryEngineHTTP qe = new QueryEngineHTTP(queryService.getEndpointUrl(), sparql);
// TODO Set the options on qe, such as timeouts
return qe;
@@ -60,4 +60,8 @@ class HttpQueryStatement extends QuerySt
// TODO
}
+ public String toString()
+ {
+ return buildFromString(queryString, null);
+ }
}
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java?rev=1341285&r1=1341284&r2=1341285&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java Tue May 22 01:27:04 2012
@@ -45,7 +45,7 @@ import com.hp.hpl.jena.update.Update ;
import com.hp.hpl.jena.update.UpdateException ;
import com.hp.hpl.jena.update.UpdateRequest ;
-public class UpdateRemote
+class UpdateRemote
{
private final String serviceURL;