You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/01/29 17:06:34 UTC
svn commit: r1439962 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/engine/binding/
main/java/com/hp/hpl/jena/sparql/util/ main/java/org/apache/jena/riot/lang/
main/java/org/apache/jena/riot/out/ main/java/org/apache/jena/riot/system/
...
Author: rvesse
Date: Tue Jan 29 16:06:33 2013
New Revision: 1439962
URL: http://svn.apache.org/viewvc?rev=1439962&view=rev
Log:
Rename PrefixMap to PrefixMapStd and rename LightweightPrefixMap to PrefixMap
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMap.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputPolicy.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputProfile.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/FastAbbreviatingPrefixMap.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMapBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/Prologue.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestLightweightPrefixMap.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFastAbbreviatingPrefixMap.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Tue Jan 29 16:06:33 2013
@@ -84,7 +84,7 @@ public class BindingInputStream extends
{
// TODO
// Don't do anything with IRIs.
- Prologue prologue = new Prologue(new PrefixMap(), IRIResolver.createNoResolve()) ;
+ Prologue prologue = new Prologue(new PrefixMapStd(), IRIResolver.createNoResolve()) ;
ErrorHandler handler = ErrorHandlerFactory.getDefaultErrorHandler() ;
ParserProfile profile = new ParserProfileBase(prologue, handler) ;
profile.setLabelToNode(LabelToNode.createUseLabelAsGiven()) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingOutputStream.java Tue Jan 29 16:06:33 2013
@@ -32,7 +32,7 @@ import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.out.NodeFormatter ;
import org.apache.jena.riot.out.NodeFormatterTTL ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
+import org.apache.jena.riot.system.PrefixMap;
import com.hp.hpl.jena.sparql.core.Var ;
@@ -42,7 +42,7 @@ public class BindingOutputStream impleme
private final Writer bw ;
private Binding lastBinding = null ;
private List<Var> vars = null ;
- private LightweightPrefixMap pmap ;
+ private PrefixMap pmap ;
private NodeFormatter nodeFormatter ;
private boolean needOutputPMap = true ;
private boolean needOutputVars = true ;
@@ -52,7 +52,7 @@ public class BindingOutputStream impleme
this(out, null, null) ;
}
- public BindingOutputStream(OutputStream out, LightweightPrefixMap prefixMapping)
+ public BindingOutputStream(OutputStream out, PrefixMap prefixMapping)
{
this(out, null, prefixMapping) ;
}
@@ -62,13 +62,13 @@ public class BindingOutputStream impleme
this(out, vars, null) ;
}
- public BindingOutputStream(OutputStream out, List<Var> vars, LightweightPrefixMap prefixMapping)
+ public BindingOutputStream(OutputStream out, List<Var> vars, PrefixMap prefixMapping)
{
//this( BufferingWriter.create(out) , vars, prefixMapping) ;
this( IO.asBufferedUTF8(out), vars, prefixMapping) ;
}
- private BindingOutputStream(Writer out, List<Var> variables, LightweightPrefixMap prefixMapping)
+ private BindingOutputStream(Writer out, List<Var> variables, PrefixMap prefixMapping)
{
bw = out ;
vars = variables ;
@@ -181,12 +181,12 @@ public class BindingOutputStream impleme
this.vars = vars ;
}
- public LightweightPrefixMap getPrefixMap()
+ public PrefixMap getPrefixMap()
{
return pmap ;
}
- public void setPrefixMap(LightweightPrefixMap pmap)
+ public void setPrefixMap(PrefixMap pmap)
{
this.pmap = pmap ;
this.needOutputPMap = true ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappingRegistry.java Tue Jan 29 16:06:33 2013
@@ -18,8 +18,8 @@
package com.hp.hpl.jena.sparql.util;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
/** Assist with naming symbols by URI.
* This class keeps a prefix mapping so that subsystems can register their
@@ -27,7 +27,7 @@ import org.apache.jena.riot.system.Prefi
*/
public class MappingRegistry
{
- private static LightweightPrefixMap mapping = new PrefixMap() ;
+ private static PrefixMap mapping = new PrefixMapStd() ;
public static void addPrefixMapping(String prefix, String uri)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java Tue Jan 29 16:06:33 2013
@@ -19,8 +19,8 @@
package com.hp.hpl.jena.sparql.util;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
public class NodeFactory
{
- private static final LightweightPrefixMap prefixMappingDefault = PrefixMap.fromPrefixMapping(SSE.getDefaultPrefixMapRead()) ;
+ private static final PrefixMap prefixMappingDefault = PrefixMapStd.fromPrefixMapping(SSE.getDefaultPrefixMapRead()) ;
/** Parse a node - with convenience prefix mapping */
public static Node parseNode(String nodeString)
@@ -43,13 +43,13 @@ public class NodeFactory
return parseNode(nodeString, prefixMappingDefault) ;
}
- private static LightweightPrefixMap pmapEmpty = new PrefixMap() ;
+ private static PrefixMap pmapEmpty = new PrefixMapStd() ;
/** Parse a string into a node.
* Pass null for the prefix mapping to indicate using no defined mappings
* Allows surrounding white space.
*/
- public static Node parseNode(String nodeString, LightweightPrefixMap pmap)
+ public static Node parseNode(String nodeString, PrefixMap pmap)
{
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(nodeString) ;
if ( ! tokenizer.hasNext() )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java Tue Jan 29 16:06:33 2013
@@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.LightweightPrefixMap ;
import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMapStd ;
/**
* A {@code PipedRDFIterator} should be connected to a {@link PipedRDFStream} implementation;
@@ -74,7 +74,7 @@ public class PipedRDFIterator<T> impleme
private final Object lock = new Object() ; // protects baseIri and prefixes
private String baseIri ;
- private final LightweightPrefixMap prefixes = new PrefixMap() ;
+ private final PrefixMap prefixes = new PrefixMapStd() ;
/**
@@ -269,12 +269,12 @@ public class PipedRDFIterator<T> impleme
*
* @return Prefix Map
*/
- public LightweightPrefixMap getPrefixes()
+ public PrefixMap getPrefixes()
{
synchronized (lock)
{
// Need to return a copy since PrefixMap is not concurrent
- return new PrefixMap(prefixes) ;
+ return new PrefixMapStd(prefixes) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java Tue Jan 29 16:06:33 2013
@@ -32,8 +32,8 @@ import org.apache.jena.atlas.lib.Chars ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.apache.jena.riot.system.Prologue ;
import org.apache.jena.riot.system.RiotChars ;
@@ -47,7 +47,7 @@ public class NodeFmtLib
// See OutputLangUtils.
// See and use EscapeStr
- static LightweightPrefixMap dftPrefixMap = new PrefixMap() ;
+ static PrefixMap dftPrefixMap = new PrefixMapStd() ;
static {
PrefixMapping pm = ARQConstants.getGlobalPrefixMap() ;
Map<String, String> map = pm.getNsPrefixMap() ;
@@ -101,7 +101,7 @@ public class NodeFmtLib
{ serialize(w, n, prologue.getBaseURI(), prologue.getPrefixMap()) ; }
- public static void serialize(Writer w, Node n, String base, LightweightPrefixMap prefixMap)
+ public static void serialize(Writer w, Node n, String base, PrefixMap prefixMap)
{
if ( prefixMap == null )
prefixMap = dftPrefixMap ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java Tue Jan 29 16:06:33 2013
@@ -30,21 +30,21 @@ import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.apache.jena.riot.system.RiotChars ;
public class NodeFormatterTTL extends NodeFormatterNT
{
private final NodeToLabel nodeToLabel = NodeToLabel.createBNodeByLabelEncoded() ;
- private final LightweightPrefixMap prefixMap ;
+ private final PrefixMap prefixMap ;
private final String baseIRI ;
- public NodeFormatterTTL(String baseIRI , LightweightPrefixMap prefixMap) //OutputPolicy outputPolicy)
+ public NodeFormatterTTL(String baseIRI , PrefixMap prefixMap) //OutputPolicy outputPolicy)
{
super(false) ;
if ( prefixMap == null )
- prefixMap = new PrefixMap() ;
+ prefixMap = new PrefixMapStd() ;
this.prefixMap = prefixMap ;
this.baseIRI = baseIRI ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java Tue Jan 29 16:06:33 2013
@@ -30,7 +30,7 @@ import org.apache.jena.atlas.io.OutputUt
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
+import org.apache.jena.riot.system.PrefixMap;
import org.apache.jena.riot.system.Prologue ;
import org.apache.jena.riot.system.SyntaxLabels ;
@@ -179,7 +179,7 @@ public class OutputLangUtils
{
if ( prologue != null )
{
- LightweightPrefixMap pmap = prologue.getPrefixMap() ;
+ PrefixMap pmap = prologue.getPrefixMap() ;
if ( pmap != null )
{
String pname = prefixFor(iriStr, pmap) ;
@@ -208,7 +208,7 @@ public class OutputLangUtils
print(out,">") ;
}
- private static String prefixFor(String uri, LightweightPrefixMap mapping)
+ private static String prefixFor(String uri, PrefixMap mapping)
{
if ( mapping == null ) return null ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputPolicy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputPolicy.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputPolicy.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputPolicy.java Tue Jan 29 16:06:33 2013
@@ -18,17 +18,17 @@
package org.apache.jena.riot.out;
-import org.apache.jena.riot.system.LightweightPrefixMap;
+import org.apache.jena.riot.system.PrefixMap;
public class OutputPolicy
{
final NodeToLabel nodeToLabel ;
- final LightweightPrefixMap prefixMap ;
+ final PrefixMap prefixMap ;
final String baseIRI ;
public OutputPolicy(NodeToLabel nodeToLabel,
String baseIRI,
- LightweightPrefixMap prefixMap)
+ PrefixMap prefixMap)
{
this.nodeToLabel = nodeToLabel ;
this.baseIRI = baseIRI ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputProfile.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputProfile.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputProfile.java Tue Jan 29 16:06:33 2013
@@ -18,7 +18,7 @@
package org.apache.jena.riot.out;
-import org.apache.jena.riot.system.LightweightPrefixMap;
+import org.apache.jena.riot.system.PrefixMap;
import org.apache.jena.riot.system.Prologue ;
public class OutputProfile
@@ -28,6 +28,6 @@ public class OutputProfile
public Prologue prologue ;
- public LightweightPrefixMap prefixMap() { return prologue.getPrefixMap() ; }
+ public PrefixMap prefixMap() { return prologue.getPrefixMap() ; }
// URI to relative URI.
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/FastAbbreviatingPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/FastAbbreviatingPrefixMap.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/FastAbbreviatingPrefixMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/FastAbbreviatingPrefixMap.java Tue Jan 29 16:06:33 2013
@@ -34,11 +34,11 @@ import com.hp.hpl.jena.shared.PrefixMapp
/**
* A prefix map implementation suited to output heavy workloads
* <p>
- * This is an alternative implementation of the {@link LightweightPrefixMap}
- * interface, it is broadly similar to the default {@link PrefixMap}
+ * This is an alternative implementation of the {@link PrefixMap}
+ * interface, it is broadly similar to the default {@link PrefixMapStd}
* implementation but is faster in output heavy workloads. If you are calling
- * the {@link LightweightPrefixMap#expand(String)} or
- * {@link LightweightPrefixMap#expand(String, String)} methods a lot then you
+ * the {@link PrefixMap#expand(String)} or
+ * {@link PrefixMap#expand(String, String)} methods a lot then you
* should be using this implementation.
* </p>
* <p>
@@ -75,7 +75,7 @@ public class FastAbbreviatingPrefixMap e
* @param pmap
* Prefix Map
*/
- public FastAbbreviatingPrefixMap(LightweightPrefixMap pmap) {
+ public FastAbbreviatingPrefixMap(PrefixMap pmap) {
this.putAll(pmap);
}
@@ -133,7 +133,7 @@ public class FastAbbreviatingPrefixMap e
}
@Override
- public void putAll(LightweightPrefixMap pmap) {
+ public void putAll(PrefixMap pmap) {
Map<String, IRI> map = pmap.getMapping();
for (String prefix : map.keySet()) {
this.add(prefix, map.get(prefix));
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMapBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMapBase.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMapBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/LightweightPrefixMapBase.java Tue Jan 29 16:06:33 2013
@@ -25,11 +25,11 @@ import org.apache.jena.atlas.lib.Pair;
import org.apache.jena.iri.IRI;
/**
- * Abstract base implementation of a {@link LightweightPrefixMap} which provides
+ * Abstract base implementation of a {@link PrefixMap} which provides
* some useful helper methods
*
*/
-public abstract class LightweightPrefixMapBase implements LightweightPrefixMap {
+public abstract class LightweightPrefixMapBase implements PrefixMap {
protected boolean strSafeFor(String str, char ch) {
return str.indexOf(ch) == -1;
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java?rev=1439962&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap.java Tue Jan 29 16:06:33 2013
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jena.riot.system;
+
+import java.util.Map;
+
+import org.apache.jena.atlas.lib.Pair;
+import org.apache.jena.iri.IRI;
+
+import com.hp.hpl.jena.shared.PrefixMapping;
+
+/**
+ * Interface for lightweight prefix maps, this is similar to
+ * {@link PrefixMapping} from Jena Core but it omits any reverse lookup
+ * functionality.
+ * <p>
+ * The contract also does not require an implementation to do any validation
+ * unlike the Jena Core {@link PrefixMapping} which require validation of
+ * prefixes.
+ * </p>
+ * <h3>Implementations</h3>
+ * <p>
+ * For input dominated workloads where you are primarily calling
+ * {@link #expand(String)} or {@link #expand(String, String)} it is best to use
+ * the default implementation - {@link PrefixMapStd}. For output dominated
+ * workloads where you are primarily calling {@link #abbrev(String)} or
+ * {@link #abbreviate(String)} it is better to use the {@link FastAbbreviatingPrefixMap}
+ * implementation. See the javadoc for those classes for more explanation
+ * of their differences.
+ * </p>
+ *
+ */
+public interface PrefixMap {
+
+ /**
+ * Return the underlying mapping, this is generally unsafe to modify and
+ * implementations may opt to return an unmodifiable view of the mapping if
+ * they wish
+ *
+ * @return Underlying mapping
+ * */
+ public abstract Map<String, IRI> getMapping();
+
+ /**
+ * Return a fresh copy of the underlying mapping, should be safe to modify
+ * unlike the mapping returned from {@link #getMapping()}
+ *
+ * @return Copy of the mapping
+ */
+ public abstract Map<String, IRI> getMappingCopy();
+
+ /**
+ * Gets a fresh copy of the mapping with the IRIs translated into their
+ * strings
+ *
+ * @return Copy of the mapping
+ */
+ public abstract Map<String, String> getMappingCopyStr();
+
+ /**
+ * Add a prefix, overwrites any existing association
+ *
+ * @param prefix
+ * Prefix
+ * @param iriString
+ * Namespace IRI
+ */
+ public abstract void add(String prefix, String iriString);
+
+ /**
+ * Add a prefix, overwrites any existing association
+ *
+ * @param prefix
+ * Prefix
+ * @param iri
+ * Namespace IRI
+ */
+ public abstract void add(String prefix, IRI iri);
+
+ /**
+ * Add a prefix, overwrites any existing association
+ *
+ * @param pmap
+ * Prefix Map
+ */
+ public abstract void putAll(PrefixMap pmap);
+
+ /**
+ * Add a prefix, overwrites any existing association
+ *
+ * @param pmap
+ * Prefix Mapping
+ */
+ public abstract void putAll(PrefixMapping pmap);
+
+ /**
+ * Delete a prefix
+ *
+ * @param prefix
+ * Prefix to delete
+ */
+ public abstract void delete(String prefix);
+
+ /**
+ * Gets whether the map contains a given prefix
+ *
+ * @param prefix
+ * Prefix
+ * @return True if the prefix is contained in the map, false otherwise
+ */
+ public abstract boolean contains(String prefix);
+
+ /**
+ * Abbreviate an IRI or return null
+ *
+ * @param uriStr
+ * URI to abbreviate
+ * @return URI in prefixed name form if possible, null otherwise
+ */
+ public abstract String abbreviate(String uriStr);
+
+ /**
+ * Abbreviate an IRI or return a pair of prefix and local parts.
+ *
+ * @param uriStr
+ * URI string to abbreviate
+ * @return Pair of prefix and local name
+ * @see #abbreviate
+ */
+ public abstract Pair<String, String> abbrev(String uriStr);
+
+ /**
+ * Expand a prefix named, return null if it can't be expanded
+ *
+ * @param prefixedName
+ * Prefixed Name
+ * @return Expanded URI if possible, null otherwise
+ */
+ public abstract String expand(String prefixedName);
+
+ /**
+ * Expand a prefix, return null if it can't be expanded
+ *
+ * @param prefix
+ * Prefix
+ * @param localName
+ * Local name
+ * @return Expanded URI if possible, null otherwise
+ */
+ public abstract String expand(String prefix, String localName);
+
+}
\ No newline at end of file
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap2.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMap2.java Tue Jan 29 16:06:33 2013
@@ -23,16 +23,16 @@ import org.apache.jena.iri.IRI;
// UNUSED
/**
- * Implementation of a {@link LightweightPrefixMap} which extends another prefix
+ * Implementation of a {@link PrefixMap} which extends another prefix
* map without ever altering the parent
*/
-public class PrefixMap2 extends PrefixMap {
- LightweightPrefixMap parent;
- LightweightPrefixMap local;
+public class PrefixMap2 extends PrefixMapStd {
+ PrefixMap parent;
+ PrefixMap local;
- public PrefixMap2(LightweightPrefixMap ext) {
+ public PrefixMap2(PrefixMap ext) {
this.parent = ext;
- this.local = new PrefixMap();
+ this.local = new PrefixMapStd();
}
/** Add a prefix, overwites any existing association */
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java?rev=1439962&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java Tue Jan 29 16:06:33 2013
@@ -0,0 +1,268 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.jena.atlas.iterator.Iter;
+import org.apache.jena.atlas.lib.ActionKeyValue;
+import org.apache.jena.atlas.lib.Pair;
+import org.apache.jena.iri.IRI;
+import org.apache.jena.iri.IRIFactory;
+
+import com.hp.hpl.jena.shared.PrefixMapping;
+
+/**
+ * Default implementation of a {@code LightweightPrefixMap}, this implementation
+ * is best suited to use for input.
+ * <p>
+ * If you are using this primarily to abbreviate URIs for output consider using
+ * the {@link FastAbbreviatingPrefixMap} instead which offers much better abbreviation
+ * performance.
+ */
+public class PrefixMapStd extends LightweightPrefixMapBase {
+ final Map<String, IRI> prefixes = new HashMap<String, IRI>();
+ private final Map<String, IRI> prefixes2 = Collections.unmodifiableMap(prefixes);
+
+ /**
+ * Creates a prefix map copying prefixes from an existing prefix mapping
+ * @param pmap Prefix Mapping
+ * @return Prefix Map
+ */
+ public static PrefixMap fromPrefixMapping(PrefixMapping pmap) {
+ PrefixMapStd pm = new PrefixMapStd();
+ pm.putAll(pmap);
+ return pm;
+ }
+
+ /**
+ * Creates a new empty prefix mapping
+ */
+ public PrefixMapStd() {
+ }
+
+ /**
+ * Creates a new prefix mapping copied from an existing map
+ * @param prefixMap Prefix Map
+ */
+ public PrefixMapStd(PrefixMap prefixMap) {
+ prefixes.putAll(prefixMap.getMapping());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jena.riot.system.LightweightPrefixMap#getMapping()
+ */
+ @Override
+ public Map<String, IRI> getMapping() {
+ return prefixes2;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jena.riot.system.LightweightPrefixMap#getMappingCopy()
+ */
+ @Override
+ public Map<String, IRI> getMappingCopy() {
+ return new HashMap<String, IRI>(prefixes);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.jena.riot.system.LightweightPrefixMap#getMappingCopyStr()
+ */
+ @Override
+ public Map<String, String> getMappingCopyStr() {
+ final Map<String, String> smap = new HashMap<String, String>();
+ ActionKeyValue<String, IRI> action = new ActionKeyValue<String, IRI>() {
+ @Override
+ public void apply(String key, IRI value) {
+ String str = value.toString();
+ smap.put(key, str);
+ }
+ };
+ Iter.apply(getMapping(), action);
+ return smap;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#add(java.lang.String,
+ * java.lang.String)
+ */
+ @Override
+ public void add(String prefix, String iriString) {
+ prefix = canonicalPrefix(prefix);
+ IRI iri = IRIFactory.iriImplementation().create(iriString);
+ // Check!
+ prefixes.put(prefix, iri);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#add(java.lang.String,
+ * org.apache.jena.iri.IRI)
+ */
+ @Override
+ public void add(String prefix, IRI iri) {
+ prefix = canonicalPrefix(prefix);
+ prefixes.put(prefix, iri);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#putAll(org.apache.jena
+ * .riot.system.PrefixMap)
+ */
+ @Override
+ public void putAll(PrefixMap pmap) {
+ prefixes.putAll(pmap.getMapping());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#putAll(com.hp.hpl.jena
+ * .shared.PrefixMapping)
+ */
+ @Override
+ public void putAll(PrefixMapping pmap) {
+ for (Map.Entry<String, String> e : pmap.getNsPrefixMap().entrySet())
+ add(e.getKey(), e.getValue());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#delete(java.lang.String)
+ */
+ @Override
+ public void delete(String prefix) {
+ prefix = canonicalPrefix(prefix);
+ prefixes.remove(prefix);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#contains(java.lang.String
+ * )
+ */
+ @Override
+ public boolean contains(String prefix) {
+ prefix = canonicalPrefix(prefix);
+ return _contains(prefix);
+ }
+
+ protected boolean _contains(String prefix) {
+ return prefixes.containsKey(prefix);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#abbreviate(java.lang
+ * .String)
+ */
+ @Override
+ public String abbreviate(String uriStr) {
+ Pair<String, String> p = abbrev(this.prefixes, uriStr, true);
+ if (p == null)
+ return null;
+ return p.getLeft() + ":" + p.getRight();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#abbrev(java.lang.String)
+ */
+ @Override
+ public Pair<String, String> abbrev(String uriStr) {
+ return abbrev(this.prefixes, uriStr, true);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#expand(java.lang.String)
+ */
+ @Override
+ public String expand(String prefixedName) {
+ int i = prefixedName.indexOf(':');
+ if (i < 0)
+ return null;
+ return expand(prefixedName.substring(0, i), prefixedName.substring(i + 1));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.jena.riot.system.LightweightPrefixMap#expand(java.lang.String,
+ * java.lang.String)
+ */
+ @Override
+ public String expand(String prefix, String localName) {
+ prefix = canonicalPrefix(prefix);
+ IRI x = prefixes.get(prefix);
+ if (x == null)
+ return null;
+ return x.toString() + localName;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("{ ");
+ boolean first = true;
+
+ for (Entry<String, IRI> e : prefixes.entrySet()) {
+ String prefix = e.getKey();
+ IRI iri = e.getValue();
+ if (first)
+ first = false;
+ else
+ sb.append(" ,");
+ sb.append(prefix);
+ sb.append(":=");
+ sb.append(iri.toString());
+ }
+ sb.append(" }");
+ return sb.toString();
+ }
+}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/Prologue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/Prologue.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/Prologue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/Prologue.java Tue Jan 29 16:06:33 2013
@@ -30,15 +30,15 @@ public class Prologue
protected boolean seenBaseURI = false ; // Implicit or set.
// protected String baseURI = null ;
- protected LightweightPrefixMap prefixMap = null ;
+ protected PrefixMap prefixMap = null ;
protected IRIResolver resolver = null ;
public static Prologue create(String base, PrefixMapping pmapping)
{
- PrefixMap pmap = null ;
+ PrefixMapStd pmap = null ;
if ( pmapping != null )
{
- pmap = new PrefixMap() ;
+ pmap = new PrefixMapStd() ;
Map<String, String> x = pmapping.getNsPrefixMap() ;
for ( Entry<String, String> e : x.entrySet() )
pmap.add(e.getKey(), e.getValue()) ;
@@ -51,11 +51,11 @@ public class Prologue
public Prologue()
{
- this.prefixMap = new PrefixMap() ;
+ this.prefixMap = new PrefixMapStd() ;
this.resolver = null ;
}
- public Prologue(LightweightPrefixMap pmap, IRIResolver resolver)
+ public Prologue(PrefixMap pmap, IRIResolver resolver)
{
this.prefixMap = pmap ;
this.resolver = resolver ;
@@ -69,26 +69,26 @@ public class Prologue
public Prologue copy()
{
- PrefixMap prefixMap = new PrefixMap(this.prefixMap) ;
+ PrefixMapStd prefixMap = new PrefixMapStd(this.prefixMap) ;
return new Prologue(prefixMap, resolver) ;
}
public void usePrologueFrom(Prologue other)
{
// Copy.
- prefixMap = new PrefixMap(other.prefixMap) ;
+ prefixMap = new PrefixMapStd(other.prefixMap) ;
seenBaseURI = false ;
if ( other.resolver != null )
resolver = IRIResolver.create(other.resolver.getBaseIRIasString()) ;
}
- public Prologue sub(LightweightPrefixMap newMappings) { return sub(newMappings, null) ; }
+ public Prologue sub(PrefixMap newMappings) { return sub(newMappings, null) ; }
public Prologue sub(String base) { return sub(null, base) ; }
- public Prologue sub(LightweightPrefixMap newMappings, String base)
+ public Prologue sub(PrefixMap newMappings, String base)
{
// New prefix mappings
- LightweightPrefixMap ext = getPrefixMap() ;
+ PrefixMap ext = getPrefixMap() ;
if ( newMappings != null )
ext = new PrefixMap2(ext) ;
// New base.
@@ -158,9 +158,9 @@ public class Prologue
}
/** Return the prefix map from the parsed query */
- public LightweightPrefixMap getPrefixMap() { return prefixMap ; }
+ public PrefixMap getPrefixMap() { return prefixMap ; }
/** Set the mapping */
- public void setPrefixMapping(LightweightPrefixMap pmap ) { prefixMap = pmap ; }
+ public void setPrefixMapping(PrefixMap pmap ) { prefixMap = pmap ; }
// /** Reverse lookup of a URI to get a prefix */
// public String getPrefix(String uriStr)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java Tue Jan 29 16:06:33 2013
@@ -64,7 +64,7 @@ public class RiotLib
static ParserProfile profile = profile(RDFLanguages.TURTLE, null, null) ;
static {
- LightweightPrefixMap pmap = profile.getPrologue().getPrefixMap() ;
+ PrefixMap pmap = profile.getPrologue().getPrefixMap() ;
pmap.add("rdf", ARQConstants.rdfPrefix) ;
pmap.add("rdfs", ARQConstants.rdfsPrefix) ;
pmap.add("xsd", ARQConstants.xsdPrefix) ;
@@ -106,9 +106,9 @@ public class RiotLib
{
Prologue prologue ;
if ( resolveIRIs )
- prologue = new Prologue(new PrefixMap(), IRIResolver.create(baseIRI)) ;
+ prologue = new Prologue(new PrefixMapStd(), IRIResolver.create(baseIRI)) ;
else
- prologue = new Prologue(new PrefixMap(), IRIResolver.createNoResolve()) ;
+ prologue = new Prologue(new PrefixMapStd(), IRIResolver.createNoResolve()) ;
if ( checking )
return new ParserProfileChecker(prologue, handler) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java Tue Jan 29 16:06:33 2013
@@ -46,7 +46,7 @@ import org.apache.jena.atlas.io.PeekRead
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
+import org.apache.jena.riot.system.PrefixMap;
import org.apache.jena.riot.system.Prologue ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
@@ -410,7 +410,7 @@ public final class Token
* 2/ No prefix or URI resolution.
* 3/ No checking.
*/
- public Node asNode(LightweightPrefixMap pmap)
+ public Node asNode(PrefixMap pmap)
{
switch(tokenType)
{
@@ -527,7 +527,7 @@ public final class Token
return tokenForNode(n, prologue.getBaseURI(), prologue.getPrefixMap()) ;
}
- public static Token tokenForNode(Node node, String base, LightweightPrefixMap mapping)
+ public static Token tokenForNode(Node node, String base, PrefixMap mapping)
{
if ( node.isURI() )
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Tue Jan 29 16:06:33 2013
@@ -26,8 +26,8 @@ import java.util.List ;
import junit.framework.JUnit4TestAdapter ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.junit.AfterClass ;
@@ -71,7 +71,7 @@ public class TestBindingStreams extends
static Binding bb2 = build("(?a 'a\"b\"c') (?b 1)");
static Binding bb3 = build("(?a 'aΩc') (?b 1)");
- static LightweightPrefixMap pmap = new PrefixMap() ;
+ static PrefixMap pmap = new PrefixMapStd() ;
static {
pmap.add(":", "http://example/") ;
}
@@ -137,7 +137,7 @@ public class TestBindingStreams extends
static void testWriteRead(Binding ... bindings) { testWriteRead(null, bindings) ; }
- static void testWriteRead(LightweightPrefixMap prefixMap, Binding ... bindings)
+ static void testWriteRead(PrefixMap prefixMap, Binding ... bindings)
{
ByteArrayOutputStream out = new ByteArrayOutputStream() ;
BindingOutputStream output = new BindingOutputStream(out, prefixMap) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java Tue Jan 29 16:06:33 2013
@@ -20,7 +20,7 @@ package org.apache.jena.riot.lang;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.system.LightweightPrefixMap ;
+import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -245,7 +245,7 @@ public class TestTurtleTerms extends Bas
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(testString) ;
StreamRDF sink = StreamRDFLib.sinkNull() ;
LangTurtle parser = RiotReader.createParserTurtle(tokenizer, "http://base/", sink) ;
- LightweightPrefixMap prefixMap = parser.getProfile().getPrologue().getPrefixMap() ;
+ PrefixMap prefixMap = parser.getProfile().getPrologue().getPrefixMap() ;
prefixMap.add("a", "http://host/a#") ;
prefixMap.add("x", "http://host/a#") ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java Tue Jan 29 16:06:33 2013
@@ -24,8 +24,8 @@ import org.apache.jena.atlas.junit.BaseT
import org.apache.jena.riot.out.NodeFormatter ;
import org.apache.jena.riot.out.NodeFormatterNT ;
import org.apache.jena.riot.out.NodeFormatterTTL ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.util.NodeF
public class TestNodeFmt extends BaseTest
{
private static String base = "http://example.org/base" ;
- private static LightweightPrefixMap prefixMap = new PrefixMap() ;
+ private static PrefixMap prefixMap = new PrefixMapStd() ;
static {
prefixMap.add(":", "http://example/p") ;
prefixMap.add("ex", "http://example/ex/") ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestLightweightPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestLightweightPrefixMap.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestLightweightPrefixMap.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestLightweightPrefixMap.java Tue Jan 29 16:06:33 2013
@@ -24,7 +24,7 @@ import org.apache.jena.iri.IRIFactory ;
import org.junit.Test ;
/**
- * Abstract tests for {@link LightweightPrefixMap} implementations
+ * Abstract tests for {@link PrefixMap} implementations
*
*/
public abstract class AbstractTestLightweightPrefixMap extends BaseTest {
@@ -36,14 +36,14 @@ public abstract class AbstractTestLightw
*
* @return Prefix Map
*/
- protected abstract LightweightPrefixMap getPrefixMap();
+ protected abstract PrefixMap getPrefixMap();
/**
* Simple expand test
*/
@Test
public void prefixMap_expand_01() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "", "http://example/");
String x = pmap.expand("", "x");
assertEquals("http://example/x", x);
@@ -54,7 +54,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_expand_02() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://example/");
String x = pmap.expand("", "x");
assertNull(x);
@@ -65,7 +65,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_expand_03() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
// Defining twice should not cause an issue
add(pmap, "ex", "http://example/");
add(pmap, "ex", "http://example/");
@@ -78,7 +78,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_expand_04() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
// The most recent definition should always be the one that applies
add(pmap, "ex", "http://example/");
add(pmap, "ex", "http://elsewhere/ns#");
@@ -91,7 +91,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_delete_01() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
// Deleting a non-existent prefix should not cause an issue
pmap.delete("ex");
}
@@ -101,7 +101,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_delete_02() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://example/");
String x = pmap.expand("ex", "x");
assertEquals("http://example/x", x);
@@ -115,7 +115,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_01() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
String x = pmap.abbreviate("http://example/x");
assertNull(x);
}
@@ -125,7 +125,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_02() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://elsewhere/ns#");
String x = pmap.abbreviate("http://example/x");
assertNull(x);
@@ -136,7 +136,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_03() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://example/");
add(pmap, "eg", "http://elsewhere/ns#");
String x = pmap.abbreviate("http://example/x");
@@ -149,7 +149,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_04() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://example/");
add(pmap, "eg", "http://example/ns#");
String x = pmap.abbreviate("http://example/x");
@@ -162,7 +162,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_05() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
add(pmap, "ex", "http://example/");
add(pmap, "eg", "http://example/");
String x = pmap.abbreviate("http://example/x");
@@ -176,7 +176,7 @@ public abstract class AbstractTestLightw
*/
@Test
public void prefixMap_abbrev_06() {
- LightweightPrefixMap pmap = this.getPrefixMap();
+ PrefixMap pmap = this.getPrefixMap();
for (int i = 1; i <= 100; i++) {
add(pmap, "ns" + i, "http://example/ns" + i + "#");
}
@@ -184,8 +184,8 @@ public abstract class AbstractTestLightw
assertEquals("ns100:x", x);
}
- protected LightweightPrefixMap create() {
- LightweightPrefixMap pm = getPrefixMap();
+ protected PrefixMap create() {
+ PrefixMap pm = getPrefixMap();
pm.add("p0", "http://example/a/");
pm.add("p1", "http://example/a/b");
pm.add("p2", "http://example/a/b/");
@@ -241,7 +241,7 @@ public abstract class AbstractTestLightw
}
public void pmTest(String iriStr, String... expected) {
- LightweightPrefixMap pm = create();
+ PrefixMap pm = create();
String x = pm.abbreviate(iriStr);
if ( expected.length == 0 )
{
@@ -266,7 +266,7 @@ public abstract class AbstractTestLightw
* @param uri
* URI
*/
- protected void add(LightweightPrefixMap pmap, String prefix, String uri) {
+ protected void add(PrefixMap pmap, String prefix, String uri) {
pmap.add(prefix, factory.create(uri));
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestAbbreviationPerformance.java Tue Jan 29 16:06:33 2013
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Test for performance of {@link LightweightPrefixMap} implementations
+ * Test for performance of {@link PrefixMap} implementations
*
*/
public class TestAbbreviationPerformance {
@@ -34,7 +34,7 @@ public class TestAbbreviationPerformance
* @param namespaces Number of namespaces
* @param fastShouldWin Whether the FastAbbreviatingPrefixMap should outperform the PrefixMap
*/
- private void test_amalgamated_performance(PrefixMap normal, FastAbbreviatingPrefixMap fast, int namespaces, boolean fastShouldWin) {
+ private void test_amalgamated_performance(PrefixMapStd normal, FastAbbreviatingPrefixMap fast, int namespaces, boolean fastShouldWin) {
long nPerf = 0, fPerf = 0;
for (int i = 1; i <= namespaces; i++) {
@@ -56,7 +56,7 @@ public class TestAbbreviationPerformance
}
}
- private long run(LightweightPrefixMap pmap, String input, String expected, int runs) {
+ private long run(PrefixMap pmap, String input, String expected, int runs) {
long start = System.nanoTime();
for (int i = 1; i <= runs; i++) {
String x = pmap.abbreviate(input);
@@ -65,19 +65,19 @@ public class TestAbbreviationPerformance
return System.nanoTime() - start;
}
- private void populate(LightweightPrefixMap pmap, int count) {
+ private void populate(PrefixMap pmap, int count) {
for (int i = 1; i <= count; i++) {
pmap.add("ns" + i, "http://example/ns" + i + "#");
}
}
/**
- * Expect {@link PrefixMap} to outperform {@link FastAbbreviatingPrefixMap} when there
+ * Expect {@link PrefixMapStd} to outperform {@link FastAbbreviatingPrefixMap} when there
* is a single namespace
*/
@Test
public void prefixMap_abbrev_performance_01() {
- PrefixMap pmap = new PrefixMap();
+ PrefixMapStd pmap = new PrefixMapStd();
populate(pmap, 1);
FastAbbreviatingPrefixMap fmap = new FastAbbreviatingPrefixMap();
populate(fmap, 1);
@@ -86,12 +86,12 @@ public class TestAbbreviationPerformance
}
/**
- * Expect {@link FastAbbreviatingPrefixMap} to outperform {@link PrefixMap} as soon as
+ * Expect {@link FastAbbreviatingPrefixMap} to outperform {@link PrefixMapStd} as soon as
* there are a few namespaces
*/
@Test
public void prefixMap_abbrev_performance_02() {
- PrefixMap pmap = new PrefixMap();
+ PrefixMapStd pmap = new PrefixMapStd();
populate(pmap, 5);
FastAbbreviatingPrefixMap fmap = new FastAbbreviatingPrefixMap();
populate(fmap, 5);
@@ -101,11 +101,11 @@ public class TestAbbreviationPerformance
/**
* Expect {@link FastAbbreviatingPrefixMap} to significantly outperform
- * {@link PrefixMap} once there are a good number of namespaces
+ * {@link PrefixMapStd} once there are a good number of namespaces
*/
@Test
public void prefixMap_abbrev_performance_03() {
- PrefixMap pmap = new PrefixMap();
+ PrefixMapStd pmap = new PrefixMapStd();
populate(pmap, 20);
FastAbbreviatingPrefixMap fmap = new FastAbbreviatingPrefixMap();
populate(fmap, 20);
@@ -115,11 +115,11 @@ public class TestAbbreviationPerformance
/**
* Expect {@link FastAbbreviatingPrefixMap} to significantly outperform
- * {@link PrefixMap} once there are a good number of namespaces
+ * {@link PrefixMapStd} once there are a good number of namespaces
*/
@Test
public void prefixMap_abbrev_performance_04() {
- PrefixMap pmap = new PrefixMap();
+ PrefixMapStd pmap = new PrefixMapStd();
populate(pmap, 100);
FastAbbreviatingPrefixMap fmap = new FastAbbreviatingPrefixMap();
populate(fmap, 100);
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFastAbbreviatingPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFastAbbreviatingPrefixMap.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFastAbbreviatingPrefixMap.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFastAbbreviatingPrefixMap.java Tue Jan 29 16:06:33 2013
@@ -25,7 +25,7 @@ package org.apache.jena.riot.system;
public class TestFastAbbreviatingPrefixMap extends AbstractTestLightweightPrefixMap {
@Override
- protected LightweightPrefixMap getPrefixMap() {
+ protected PrefixMap getPrefixMap() {
return new FastAbbreviatingPrefixMap();
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java Tue Jan 29 16:06:33 2013
@@ -19,13 +19,13 @@
package org.apache.jena.riot.system;
/**
- * Test the standard {@link PrefixMap} implementation
+ * Test the standard {@link PrefixMapStd} implementation
*
*/
public class TestPrefixMap extends AbstractTestLightweightPrefixMap {
@Override
- protected LightweightPrefixMap getPrefixMap() {
- return new PrefixMap();
+ protected PrefixMap getPrefixMap() {
+ return new PrefixMapStd();
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java?rev=1439962&r1=1439961&r2=1439962&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java Tue Jan 29 16:06:33 2013
@@ -19,8 +19,8 @@
package org.apache.jena.riot.tokens;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.system.LightweightPrefixMap;
-import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapStd ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.TokenType ;
import org.junit.BeforeClass ;
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.sparql.util.NodeF
public class TestTokenForNode extends BaseTest
{
static String base = "http://localhost/" ;
- static LightweightPrefixMap prefixMap = new PrefixMap() ;
+ static PrefixMap prefixMap = new PrefixMapStd() ;
@BeforeClass static public void beforeClass()
{