Repository: jena Updated Branches: refs/heads/master 0f2a544a6 -> 60a56cb80
Factor out PrefixMappingImpl.remove Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/22a94e88 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/22a94e88 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/22a94e88 Branch: refs/heads/master Commit: 22a94e88b032cb2df52541f2c2d190e11f4b0e90 Parents: 0f2a544 Author: Andy Seaborne <[email protected]> Authored: Mon Jun 13 12:29:51 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Jun 13 12:29:51 2016 +0100 ---------------------------------------------------------------------- .../sparql/graph/GraphPrefixesProjection.java | 10 ++++----- .../syntaxtransform/QueryTransformOps.java | 3 +++ .../jena/shared/impl/PrefixMappingImpl.java | 22 ++++++++++++-------- 3 files changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/22a94e88/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 9cd6ba9..5b51879 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 @@ -21,7 +21,6 @@ package org.apache.jena.sparql.graph; import java.util.Map; import java.util.Map.Entry; -import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.shared.impl.PrefixMappingImpl ; import org.apache.jena.sparql.core.DatasetPrefixStorage ; @@ -100,12 +99,11 @@ public class GraphPrefixesProjection extends PrefixMappingImpl } @Override - public PrefixMapping removeNsPrefix(String prefix) - { + protected void remove(String prefix) { String uri = super.getNsPrefixURI(prefix) ; - if ( uri != null ) + if ( uri != null ) { prefixes.removeFromPrefixMap(graphName, prefix) ; - super.removeNsPrefix(prefix) ; - return this ; + super.remove(prefix); + } } } http://git-wip-us.apache.org/repos/asf/jena/blob/22a94e88/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java index d5c33c3..cc82464 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java @@ -52,6 +52,9 @@ public class QueryTransformOps { transformVarExprList(q2.getProject(), exprTransform) ; transformVarExprList(q2.getGroupBy(), exprTransform) ; // Nothing to do about ORDER BY - leave to sort by that variable. + +// if ( q2.hasHaving() ) {} +// if ( q2.hasAggregators() ) {} Element el = q2.getQueryPattern() ; Element el2 = ElementTransformer.transform(el, transform, exprTransform) ; http://git-wip-us.apache.org/repos/asf/jena/blob/22a94e88/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java index 2852170..78f5d93 100644 --- a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java +++ b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java @@ -43,15 +43,19 @@ public class PrefixMappingImpl implements PrefixMapping URItoPrefix = CollectionFactory.createHashedMap(); } - protected void set( String prefix, String uri ) - { + protected void set(String prefix, String uri) { prefixToURI.put(prefix, uri) ; URItoPrefix.put(uri, prefix) ; - } - - protected String get( String prefix ) - { return prefixToURI.get( prefix ); } - + } + + protected String get(String prefix) { + return prefixToURI.get(prefix) ; + } + + protected void remove(String prefix) { + prefixToURI.remove(prefix) ; + } + @Override public PrefixMapping lock() { @@ -74,8 +78,8 @@ public class PrefixMappingImpl implements PrefixMapping public PrefixMapping removeNsPrefix( String prefix ) { checkUnlocked(); - prefixToURI.remove( prefix ); - regenerateReverseMapping(); + remove(prefix); + regenerateReverseMapping() ; return this; }
