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 2016/06/13 11:43:37 UTC
[1/2] jena git commit: Factor out PrefixMappingImpl.remove
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 <an...@apache.org>
Authored: Mon Jun 13 12:29:51 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
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;
}
[2/2] jena git commit: Rename constant
Posted by an...@apache.org.
Rename constant
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/60a56cb8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/60a56cb8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/60a56cb8
Branch: refs/heads/master
Commit: 60a56cb805bbce893125b0b5e91e39d5f5cd98cd
Parents: 22a94e8
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 13 12:43:28 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 13 12:43:28 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/60a56cb8/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
index bb7ba33..642f145 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetPrefixesTDB.java
@@ -45,7 +45,7 @@ public class DatasetPrefixesTDB implements DatasetPrefixStorage
*/
static final RecordFactory factory = new RecordFactory(3*NodeId.SIZE, 0) ;
- static final String unamedGraphURI = "" ;
+ static final String unnamedGraphURI = "" ;
private final NodeTupleTable nodeTupleTable ;
@@ -155,7 +155,7 @@ public class DatasetPrefixesTDB implements DatasetPrefixStorage
/** Return a PrefixMapping for the unamed graph */
@Override
public PrefixMapping getPrefixMapping()
- { return getPrefixMapping(unamedGraphURI) ; }
+ { return getPrefixMapping(unnamedGraphURI) ; }
/** Return a PrefixMapping for a named graph */
@Override