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 2012/11/22 20:59:02 UTC
svn commit: r1412652 - in /jena/Experimental/riot-reader/src/main/java/dev:
Lang3.java LangBuilder.java PROJECT_RiotReader.java RDFLanguages.java
RDFParserRegistry.java
Author: andy
Date: Thu Nov 22 19:59:01 2012
New Revision: 1412652
URL: http://svn.apache.org/viewvc?rev=1412652&view=rev
Log: (empty)
Modified:
jena/Experimental/riot-reader/src/main/java/dev/Lang3.java
jena/Experimental/riot-reader/src/main/java/dev/LangBuilder.java
jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java
jena/Experimental/riot-reader/src/main/java/dev/RDFLanguages.java
jena/Experimental/riot-reader/src/main/java/dev/RDFParserRegistry.java
Modified: jena/Experimental/riot-reader/src/main/java/dev/Lang3.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/Lang3.java?rev=1412652&r1=1412651&r2=1412652&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/Lang3.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/Lang3.java Thu Nov 22 19:59:01 2012
@@ -30,10 +30,10 @@ public class Lang3
{
private final String label ;
private final ContentType contentType ; // Primary content type.
- private List<String> altContentTypes ;
- private List<String> fileExtensions ;
+ private final List<String> altContentTypes ;
+ private final List<String> fileExtensions ;
- protected Lang3(String langlabel, String mainContentType, List<String> altContentTypes, List<String> fileExt)
+ protected Lang3(String langlabel, String mainContentType, List<String> otherContentTypes, List<String> fileExt)
{
if ( langlabel == null )
throw new IllegalArgumentException("Null not allowed for language name") ;
@@ -44,13 +44,14 @@ public class Lang3
String mediaType = mainContentType ;
contentType = mediaType==null ? null : ContentType.parse(mediaType) ;
- altContentTypes = copy(altContentTypes) ;
- if ( ! altContentTypes.contains(mainContentType) )
- altContentTypes.add(mainContentType) ;
- altContentTypes = Collections.unmodifiableList(altContentTypes) ;
- fileExtensions = copy(fileExt) ;
- fileExtensions = Collections.unmodifiableList(fileExtensions) ;
+ List<String> _altContentTypes = copy(otherContentTypes) ;
+ if ( ! _altContentTypes.contains(mainContentType) )
+ _altContentTypes.add(mainContentType) ;
+ altContentTypes = Collections.unmodifiableList(_altContentTypes) ;
+
+ List<String> _fileExtensions = copy(fileExt) ;
+ fileExtensions = Collections.unmodifiableList(_fileExtensions) ;
}
static <T> List<T> copy(List<T> original)
@@ -92,5 +93,15 @@ public class Lang3
@Override
public String toString() { return "Lang:"+label ; }
+
+ public String toLongString()
+ {
+ String x = "Lang:" + label + " " + getContentType() ;
+ if (getAltContentTypes().size() > 0)
+ x = " " + getAltContentTypes() ;
+ if (getFileExtensions().size() > 0)
+ x = " " + getFileExtensions() ;
+ return x ;
+ }
}
Modified: jena/Experimental/riot-reader/src/main/java/dev/LangBuilder.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/LangBuilder.java?rev=1412652&r1=1412651&r2=1412652&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/LangBuilder.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/LangBuilder.java Thu Nov 22 19:59:01 2012
@@ -23,20 +23,47 @@ import java.util.List ;
import org.openjena.riot.RiotException ;
-/** Builder for RDF langauges (Syntaxes). */
+/** Builder for RDF langauges (Syntaxes).
+ *
+ * Example usage:
+ * <pre>
+ * LangBuilder.create()
+ * .langName("MyLang")
+ * .contentType("application/wizard")
+ * .addAltContentTypes(...)
+ * .addFileExtensions("ext1", "ext2")
+ * .build()
+ * </pre>
+ *
+ * */
public class LangBuilder {
public String lang ;
public String officialContentType ;
public List<String> contentTypes = new ArrayList<String>() ;
public List<String> fileExtensions = new ArrayList<String>() ;
+
+ /** Create a builder */
+ public static LangBuilder create()
+ {
+ return new LangBuilder() ;
+ }
- public LangBuilder(String label, String officialContentType)
+ /** Create a builder - convenience operation to
+ * take the language name and content type
+ * which should be set if at all possible.
+ */
+ public static LangBuilder create(String langname, String officialContentType)
{
- this.lang = label ;
- this.officialContentType = officialContentType ;
+ return new LangBuilder()
+ .langName(langname)
+ .contentType(officialContentType) ;
}
+ private LangBuilder() {}
+
+
+ /** Add alternative content types */
public LangBuilder addAltContentTypes(String...x)
{
contentTypes = new ArrayList<String>() ;
@@ -44,6 +71,7 @@ public class LangBuilder {
return this ;
}
+ /** Add file name extensions */
public LangBuilder addFileExtensions(String...x)
{
fileExtensions = new ArrayList<String>() ;
@@ -51,6 +79,7 @@ public class LangBuilder {
return this ;
}
+ /** Construct the {@link Lang3} */
public Lang3 build()
{
if ( lang == null )
@@ -64,4 +93,25 @@ public class LangBuilder {
{
throw new RiotException(message) ;
}
+
+ public String getContentType()
+ {
+ return officialContentType ;
+ }
+
+ /** Set the main content type for this language.
+ * If tehre is an officially registers, preferred type, this should be that.
+ */
+ public LangBuilder contentType(String officialContentType)
+ {
+ this.officialContentType = officialContentType ;
+ return this ;
+ }
+
+ /** Set the language label. A system wide, unique short name */
+ public LangBuilder langName(String langname)
+ {
+ this.lang = langname ;
+ return this ;
+ }
}
Modified: jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java?rev=1412652&r1=1412651&r2=1412652&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java Thu Nov 22 19:59:01 2012
@@ -26,6 +26,8 @@ public class PROJECT_RiotReader
// TriG and NQ tests (need isomorpic tests for quads).
// IsoMatcher
+ // IODataset / WebReader2
+
// Work out the dependencies on ARQ for splitting out RIOT
// Check language registration - public? Multiple content types easy?
Modified: jena/Experimental/riot-reader/src/main/java/dev/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/RDFLanguages.java?rev=1412652&r1=1412651&r2=1412652&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/RDFLanguages.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/RDFLanguages.java Thu Nov 22 19:59:01 2012
@@ -46,45 +46,45 @@ public class RDFLanguages
{
public static void init () {}
- private static final String strLangRDFXML = "RDF/XML" ;
- private static final String strLangTurtle = "Turtle" ;
- private static final String strLangNTriples = "N-Triples" ;
- private static final String strLangN3 = "N3" ;
- private static final String strLangRDFJSON = "RDF/JSON" ;
- private static final String strLangNQuads = "NQuads" ;
- private static final String strLangTriG = "TriG" ;
+ public static final String strLangRDFXML = "RDF/XML" ;
+ public static final String strLangTurtle = "Turtle" ;
+ public static final String strLangNTriples = "N-Triples" ;
+ public static final String strLangN3 = "N3" ;
+ public static final String strLangRDFJSON = "RDF/JSON" ;
+ public static final String strLangNQuads = "NQuads" ;
+ public static final String strLangTriG = "TriG" ;
/** RDF/XML */
- public static final Lang3 langRDFXML = new LangBuilder(strLangRDFXML, contentTypeRDFXML)
+ public static final Lang3 langRDFXML = LangBuilder.create(strLangRDFXML, contentTypeRDFXML)
.addFileExtensions("rdf","owl","xml")
.build() ;
/** Turtle */
- public static final Lang3 langTurtle = new LangBuilder(strLangTurtle, contentTypeTurtle)
+ public static final Lang3 langTurtle = LangBuilder.create(strLangTurtle, contentTypeTurtle)
.addAltContentTypes(contentTypeTurtleAlt1, contentTypeTurtleAlt2)
.addFileExtensions("ttl")
//.addFileExtensions("n3")
.build() ;
/** N-Triples */
- public static final Lang3 langNTriples = new LangBuilder(strLangNTriples, contentTypeNTriples)
+ public static final Lang3 langNTriples = LangBuilder.create(strLangNTriples, contentTypeNTriples)
.addAltContentTypes(contentTypeNTriplesAlt)
.addFileExtensions("nt")
.build() ;
/** RDF/JSON (this is not JSON-LD) */
- public static final Lang3 langRDFJSON = new LangBuilder(strLangRDFJSON, contentTypeRDFJSON)
+ public static final Lang3 langRDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON)
.addFileExtensions("rj", "json")
.build() ;
/** TriG */
- public static final Lang3 langTriG = new LangBuilder(strLangTriG, contentTypeTriG)
+ public static final Lang3 langTriG = LangBuilder.create(strLangTriG, contentTypeTriG)
.addAltContentTypes(contentTypeTriGAlt1, contentTypeTriGAlt2)
.addFileExtensions("trig")
.build() ;
/** N-Quads */
- public static final Lang3 langNQuads = new LangBuilder(strLangNQuads, contentTypeNQuads)
+ public static final Lang3 langNQuads = LangBuilder.create(strLangNQuads, contentTypeNQuads)
.addAltContentTypes(contentTypeNQuadsAlt1, contentTypeNQuadsAlt2)
.addFileExtensions("nq")
.build() ;
@@ -114,10 +114,19 @@ public class RDFLanguages
}
/** Register a language.
- * To create a {@link Lang3} object use {@link LangBuilder}.
+ * To create a {@link Lang3} object use {@link LangBuilder}.
+ * See also
+ * {@link RDFParserRegistry#registerLangTriples} and
+ * {@link RDFParserRegistry#registerLangQuads}
+ * for registering a language and it's RDF parser fatory.
+ *
+ * @see RDFParserRegistry
*/
public static void register(Lang3 lang)
{
+ if ( lang == null )
+ throw new IllegalArgumentException("null for language") ;
+ checkRegistration(lang) ;
mapLabelToLang.put(canonicalKey(lang.getLabel()), lang) ;
mapContentTypeToLang.put(canonicalKey(lang.getContentType().getContentType()), lang) ;
for ( String ct : lang.getAltContentTypes() )
@@ -130,6 +139,40 @@ public class RDFLanguages
}
}
+ /** Remove a regsitration of a language - this also removes all recorded mapping
+ * of content types and file extensions.
+ */
+
+ public static void unregister(Lang3 lang)
+ {
+ if ( lang == null )
+ throw new IllegalArgumentException("null for language") ;
+ mapLabelToLang.remove(canonicalKey(lang.getLabel())) ;
+
+ mapContentTypeToLang.remove(canonicalKey(lang.getContentType().getContentType())) ;
+
+ for ( String ct : lang.getAltContentTypes() )
+ mapContentTypeToLang.remove(canonicalKey(ct)) ;
+ for ( String ext : lang.getFileExtensions() )
+ mapFileExtToLang.remove(canonicalKey(ext)) ;
+ }
+
+ private static void checkRegistration(Lang3 lang)
+ {
+ if ( lang == null )
+ return ;
+ Lang3 lang2 = mapLabelToLang.get(canonicalKey(lang.getLabel())) ;
+ if ( lang.equals(lang2) )
+ return ;
+ throw new IllegalArgumentException("Lang '"+lang+"'is not consistent with "+lang2) ;
+ }
+
+ /** return true if the language is registered with the triples parser factories */
+ public static boolean isTriples(Lang3 lang) { return RDFParserRegistry.isTriples(lang) ; }
+
+ /** return true if the language is registered with the quads parser factories */
+ public static boolean isQuads(Lang3 lang) { return RDFParserRegistry.isQuads(lang) ; }
+
/** Map a content type (without charset) to a {@link Lang3} */
public static Lang3 contentTypeToLang(String contentType)
{
Modified: jena/Experimental/riot-reader/src/main/java/dev/RDFParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/RDFParserRegistry.java?rev=1412652&r1=1412651&r2=1412652&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/RDFParserRegistry.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/RDFParserRegistry.java Thu Nov 22 19:59:01 2012
@@ -37,6 +37,12 @@ import org.openjena.riot.lang.LangRIOT ;
import static dev.RDFLanguages.* ;
+/** The registry of languages and parsers.
+ * To register a new parser:
+ *
+ *
+ */
+
public class RDFParserRegistry
{
/** Map Jena I/O names to language */
@@ -84,31 +90,42 @@ public class RDFParserRegistry
registerShortNameForLang("TRIG", langTriG) ;
- addLangTriples(langRDFXML, pfTriples) ;
- addLangTriples(langNTriples, pfTriples) ;
- addLangTriples(langTurtle, pfTriples) ;
- addLangTriples(langRDFJSON, pfTriples) ;
+ registerLangTriples(langRDFXML, pfTriples) ;
+ registerLangTriples(langNTriples, pfTriples) ;
+ registerLangTriples(langTurtle, pfTriples) ;
+ registerLangTriples(langRDFJSON, pfTriples) ;
- addLangQuads(langNQuads, pfQuads) ;
- addLangQuads(langTriG, pfQuads) ;
+ registerLangQuads(langNQuads, pfQuads) ;
+ registerLangQuads(langTriG, pfQuads) ;
}
// ****
// getParserFor
// triples vs quads
- /** Register a language that parses to produces triples */
- private static void addLangTriples(Lang3 lang, ReaderRIOTFactory<Triple> factory)
+ /** Register a language that parses to produces triples.
+ * To create a {@link Lang3} object use {@link LangBuilder}.
+ */
+ public static void registerLangTriples(Lang3 lang, ReaderRIOTFactory<Triple> factory)
{
+ RDFLanguages.register(lang) ;
langToTriples.put(lang, factory) ;
}
/** Register a language that parses to produces quads */
- private static void addLangQuads(Lang3 lang, ReaderRIOTFactory<Quad> factory)
+ public static void registerLangQuads(Lang3 lang, ReaderRIOTFactory<Quad> factory)
{
+ RDFLanguages.register(lang) ;
langToQuads.put(lang, factory) ;
}
+ public static void removeRegistration(Lang3 lang)
+ {
+ RDFLanguages.unregister(lang) ;
+ langToTriples.remove(lang) ;
+ langToQuads.remove(lang) ;
+ }
+
/** Return the triples parser factory for the language, or null if not registered */
public static ReaderRIOTFactory<Triple> getFactoryTriples(Lang3 language)
{
@@ -120,6 +137,12 @@ public class RDFParserRegistry
{
return langToQuads.get(language) ;
}
+
+ /** return true if the language is registered with the triples parser factories */
+ public static boolean isTriples(Lang3 lang) { return langToTriples.containsKey(lang) ; }
+
+ /** return true if the language is registered with the quads parser factories */
+ public static boolean isQuads(Lang3 lang) { return langToQuads.containsKey(lang) ; }
// Triples : Generic parser factory.
private static ReaderRIOTFactory<Triple> pfTriples = new ReaderRIOTFactory<Triple>() {