You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/10/05 12:56:11 UTC
[1/5] jena git commit: Fix formatting.
Repository: jena
Updated Branches:
refs/heads/master 48f5e0be6 -> 97ec600b6
Fix formatting.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e8f6f297
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e8f6f297
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e8f6f297
Branch: refs/heads/master
Commit: e8f6f297d2eee6c23f1beb9e024b7ca743f368e3
Parents: 48f5e0b
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 5 10:09:18 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 5 10:09:18 2015 +0100
----------------------------------------------------------------------
.../jena/riot/system/PrefixMapWrapper.java | 147 +++++++++----------
1 file changed, 70 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e8f6f297/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapWrapper.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapWrapper.java
index 09d7599..8c959fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapWrapper.java
@@ -24,80 +24,73 @@ import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.shared.PrefixMapping ;
-//private static PrefixMap empty = new PrefixMapNull() ;
- /**
- * Creates an always-empty prefix map, which can not be changed.
- */
-// public static PrefixMap nullPrefixMap() {
-// }
-
- public class PrefixMapWrapper implements PrefixMap
- {
- protected final PrefixMap other ;
-
- public PrefixMapWrapper(PrefixMap other) { this.other = other ; }
-
- @Override
- public Map<String, IRI> getMapping()
- { return other.getMapping() ; }
-
- @Override
- public Map<String, IRI> getMappingCopy()
- { return other.getMappingCopy() ; }
-
- @Override
- public Map<String, String> getMappingCopyStr()
- { return other.getMappingCopyStr() ; }
-
- @Override
- public void add(String prefix, String iriString)
- { other.add(prefix, iriString) ; }
-
- @Override
- public void add(String prefix, IRI iri)
- { other.add(prefix, iri) ; }
-
- @Override
- public void putAll(PrefixMap pmap)
- { other.putAll(pmap) ; }
-
- @Override
- public void putAll(PrefixMapping pmap)
- { other.putAll(pmap) ; }
-
- @Override
- public void putAll(Map<String, String> mapping)
- { other.putAll(mapping) ; }
-
- @Override
- public void delete(String prefix)
- { other.delete(prefix) ; }
-
- @Override
- public boolean contains(String prefix)
- { return other.contains(prefix) ; }
-
- @Override
- public String abbreviate(String uriStr)
- { return other.abbreviate(uriStr) ; }
-
- @Override
- public Pair<String, String> abbrev(String uriStr)
- { return other.abbrev(uriStr) ; }
-
- @Override
- public String expand(String prefixedName)
- { return other.expand(prefixedName) ; }
-
- @Override
- public String expand(String prefix, String localName)
- { return other.expand(prefix, localName) ; }
-
- @Override
- public boolean isEmpty()
- { return other.isEmpty() ; }
-
- @Override
- public int size()
- { return other.size() ; }
- }
+public class PrefixMapWrapper implements PrefixMap
+{
+ protected final PrefixMap other ;
+
+ public PrefixMapWrapper(PrefixMap other) { this.other = other ; }
+
+ @Override
+ public Map<String, IRI> getMapping()
+ { return other.getMapping() ; }
+
+ @Override
+ public Map<String, IRI> getMappingCopy()
+ { return other.getMappingCopy() ; }
+
+ @Override
+ public Map<String, String> getMappingCopyStr()
+ { return other.getMappingCopyStr() ; }
+
+ @Override
+ public void add(String prefix, String iriString)
+ { other.add(prefix, iriString) ; }
+
+ @Override
+ public void add(String prefix, IRI iri)
+ { other.add(prefix, iri) ; }
+
+ @Override
+ public void putAll(PrefixMap pmap)
+ { other.putAll(pmap) ; }
+
+ @Override
+ public void putAll(PrefixMapping pmap)
+ { other.putAll(pmap) ; }
+
+ @Override
+ public void putAll(Map<String, String> mapping)
+ { other.putAll(mapping) ; }
+
+ @Override
+ public void delete(String prefix)
+ { other.delete(prefix) ; }
+
+ @Override
+ public boolean contains(String prefix)
+ { return other.contains(prefix) ; }
+
+ @Override
+ public String abbreviate(String uriStr)
+ { return other.abbreviate(uriStr) ; }
+
+ @Override
+ public Pair<String, String> abbrev(String uriStr)
+ { return other.abbrev(uriStr) ; }
+
+ @Override
+ public String expand(String prefixedName)
+ { return other.expand(prefixedName) ; }
+
+ @Override
+ public String expand(String prefix, String localName)
+ { return other.expand(prefix, localName) ; }
+
+ @Override
+ public boolean isEmpty()
+ { return other.isEmpty() ; }
+
+ @Override
+ public int size()
+ { return other.size() ; }
+}
[2/5] jena git commit: Code for recursively unwrapping a
DatasetGraphWrapped
Posted by an...@apache.org.
Code for recursively unwrapping a DatasetGraphWrapped
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f19fe84b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f19fe84b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f19fe84b
Branch: refs/heads/master
Commit: f19fe84bdc98d4fdd30253de8c39438858d2e559
Parents: e8f6f29
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 5 10:22:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 5 10:22:10 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/core/DatasetGraphWrapper.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f19fe84b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
index dbe725e..a54f5b1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphWrapper.java
@@ -35,10 +35,21 @@ public class DatasetGraphWrapper implements DatasetGraph, Sync
/** Return the DatasetGraph being wrapped. */
public final DatasetGraph getWrapped() {
- // Maybe should be "getQueryExecutionDatasetGraph"
return get() ;
}
+ /** Recursively unwrap a DatasetGraphWrapped.
+ *
+ * @return the first found {@link DatasetGraph} that is not an instance of {@link DatasetGraphWrapper}
+ */
+ public final DatasetGraph getBase() {
+ DatasetGraph dsgw = dsg ;
+ while (dsgw instanceof DatasetGraphWrapper) {
+ dsgw = ((DatasetGraphWrapper)dsg).getWrapped() ;
+ }
+ return dsgw ;
+ }
+
/** The dataset to use for redirection - can be overridden.
* It is also guarantee that this is called only once per
* delegated call. Changes to the wrapped object can be
[3/5] jena git commit: Fix comment.
Posted by an...@apache.org.
Fix comment.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a3c8412d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a3c8412d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a3c8412d
Branch: refs/heads/master
Commit: a3c8412de3990eabde12ff12c43dd4e1017196ce
Parents: f19fe84
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 5 10:24:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 5 10:24:41 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/core/DatasetPrefixStorage.java | 2 +-
.../java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a3c8412d/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetPrefixStorage.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetPrefixStorage.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetPrefixStorage.java
index 837adcf..09b235e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetPrefixStorage.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetPrefixStorage.java
@@ -29,7 +29,7 @@ import org.apache.jena.shared.PrefixMapping ;
public interface DatasetPrefixStorage extends Closeable, Sync
{
- /** Return the set of graph names for which their might be prefix mappings */
+ /** Return the set of graph names for which there might be prefix mappings */
public Set<String> graphNames() ;
/** Get the URI string associated with a prefix string for a specific graph (or null) */
http://git-wip-us.apache.org/repos/asf/jena/blob/a3c8412d/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
index 4f37b57..9cd6ba9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphPrefixesProjection.java
@@ -29,7 +29,7 @@ import org.apache.jena.sparql.core.DatasetPrefixStorage ;
public class GraphPrefixesProjection extends PrefixMappingImpl
{
- // Own cache and complete replace PrefixMappingImpl?
+ // Own cache and completely replace PrefixMappingImpl?
private String graphName ;
private DatasetPrefixStorage prefixes ;
[5/5] jena git commit: Javadoc and formatting.
Posted by an...@apache.org.
Javadoc and formatting.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/97ec600b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/97ec600b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/97ec600b
Branch: refs/heads/master
Commit: 97ec600b686a3068d6fd4c24f93c69910af04b57
Parents: 6a284b4
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 5 10:32:56 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 5 10:32:56 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/core/DatasetGraph.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/97ec600b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
index 0743351..8732fc4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraph.java
@@ -45,9 +45,18 @@ public interface DatasetGraph extends Closeable
/** Get the graph named by graphNode : returns null on no graph
* NB Whether a dataset contains a graph if there are no triples is not defined - see the specifc implementation.
* Some datasets are "open" - they have all graphs even if no triples,
- * */
+ */
public Graph getGraph(Node graphNode) ;
-
+
+ /**
+ * Does the DatasetGraph contain a specific named graph?
+ * Whether a dataset contains a graph if there are no triples is
+ * not defined - see the specifc implementation. Some datasets are "open" -
+ * they have all graphs even if no triples and thsi returns true always.
+ *
+ * @param graphNode
+ * @return boolean
+ */
public boolean containsGraph(Node graphNode) ;
/** Set the default graph. Set the active graph if it was null.
@@ -62,7 +71,6 @@ public interface DatasetGraph extends Closeable
* get the graph and add triples to it, or add quads to the dataset.
* Do not assume that the same Java object is returned by {@link #getGraph}
*/
-
public void addGraph(Node graphName, Graph graph) ;
/** Remove all data associated with the named graph */
[4/5] jena git commit: Use DatasetGraphWrapped unwrapping code.
Posted by an...@apache.org.
Use DatasetGraphWrapped unwrapping code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6a284b4d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6a284b4d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6a284b4d
Branch: refs/heads/master
Commit: 6a284b4ddd63faa8763a5d75d417334aed5eae33
Parents: a3c8412
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 5 10:25:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 5 10:25:29 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/servlets/HttpAction.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6a284b4d/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
index f0a60cb..03239e7 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
@@ -216,9 +216,8 @@ public class HttpAction
* @return the first found {@link DatasetGraph} that is not an instance of {@link DatasetGraphWrapper}
*/
private static DatasetGraph unwrap(DatasetGraph dsg) {
- while (dsg instanceof DatasetGraphWrapper) {
- dsg = ((DatasetGraphWrapper)dsg).getWrapped() ;
- }
+ if ( dsg instanceof DatasetGraphWrapper)
+ dsg = ((DatasetGraphWrapper)dsg).getBase() ;
return dsg ;
}