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 2013/12/16 13:22:24 UTC
svn commit: r1551196 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot: Lang.java
RDFFormat.java RDFFormatVariant.java RDFLanguages.java
Author: andy
Date: Mon Dec 16 12:22:24 2013
New Revision: 1551196
URL: http://svn.apache.org/r1551196
Log:
Add JSON-LD constants.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1551196&r1=1551195&r2=1551196&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Mon Dec 16 12:22:24 2013
@@ -45,27 +45,40 @@ public class Lang
// To avoid an initialization circularity, these are set by RDFLanguages.
static { RDFLanguages.init() ; }
- /** RDF/XML */
+ /** <a href="http://www.w3.org/TR/REC-rdf-syntax/">RDF/XML</a> */
public static Lang RDFXML ;
- /** N-triples */
- public static Lang NTRIPLES ;
- /** N-triples */
- public static Lang NT ;
- /** N3 (RDF subset of N3) */
- public static Lang N3 ;
- /** Turtle */
- public static Lang TURTLE ;
- /** Turtle */
+
+ /** <a href="http://www.w3.org/TR/turtle/">Turtle</a>*/
+ public static Lang TURTLE ;
+
+ /** Alternative constant for {@linkplain #TURTLE} */
public static Lang TTL ;
- /** RDF/JSON (this is not JSON-LD)
- * See {@link "http://jena.apache.org/documentation/io/rdf-json.html"} */
- public static Lang RDFJSON ;
- /** NQuads */
+
+ /** N3 (treat as Turtle) */
+ public static Lang N3 ;
+
+ /** <a href="http://www.w3.org/TR/n-triples/">N-Triples</a>*/
+ public static Lang NTRIPLES ;
+
+ /** Alternative constant for {@linkplain #NTRIPLES} */
+ public static Lang NT ;
+
+ /** <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
+ public static Lang JSONLD ;
+
+ /** <a href="http://www.w3.org/TR/rdf-json/">RDF/JSON</a>. This is not <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
+ public static Lang RDFJSON ;
+
+ /** <a href="http://www.w3.org/TR/trig/">TriG</a> */
+ public static Lang TRIG ;
+
+ /** <a href="http://www.w3.org/TR/n-quads">N-Quads</a> */
public static Lang NQUADS ;
- /** NQuads */
+
+ /** Alternative constant {@linkplain #NQUADS} */
public static Lang NQ ;
- /** TriG */
- public static Lang TRIG ;
+
+ /** The "null" language */
public static Lang RDFNULL ;
private final String label ; // Primary name
@@ -74,35 +87,35 @@ public class Lang
private final List<String> altContentTypes ;
private final List<String> fileExtensions ;
- // NOT public. This is to force use of the RDFLanguages which makes languages symbols and so == works
- protected Lang(String langlabel, String mainContentType, List<String> altLangLabels, List<String> otherContentTypes, List<String> fileExt)
- {
+ // NOT public. This is to force use of the RDFLanguages which makes
+ // languages symbols and so == works
+ protected Lang(String langlabel, String mainContentType, List<String> altLangLabels,
+ List<String> otherContentTypes, List<String> fileExt) {
if ( langlabel == null )
throw new IllegalArgumentException("Null not allowed for language name") ;
else
- langlabel = langlabel.intern();
+ langlabel = langlabel.intern() ;
label = langlabel ;
-
+
String mediaType = mainContentType ;
- contentType = mediaType==null ? null : ContentType.create(mediaType) ;
-
+ contentType = mediaType == null ? null : ContentType.create(mediaType) ;
+
List<String> _altContentTypes = copy(otherContentTypes) ;
- if ( ! _altContentTypes.contains(mainContentType) )
+ if ( !_altContentTypes.contains(mainContentType) )
_altContentTypes.add(mainContentType) ;
altContentTypes = Collections.unmodifiableList(_altContentTypes) ;
-
+
List<String> _altLabels = copy(altLangLabels) ;
- if ( ! _altLabels.contains(label) )
+ if ( !_altLabels.contains(label) )
_altLabels.add(label) ;
altLabels = Collections.unmodifiableList(_altLabels) ;
-
+
List<String> _fileExtensions = copy(fileExt) ;
fileExtensions = Collections.unmodifiableList(_fileExtensions) ;
}
- static <T> List<T> copy(List<T> original)
- {
+ static <T> List<T> copy(List<T> original) {
List<T> x = new ArrayList<T>() ;
x.addAll(original) ;
return x ;
@@ -112,8 +125,7 @@ public class Lang
public int hashCode() { return label.hashCode() ; }
@Override
- public boolean equals(Object other)
- {
+ public boolean equals(Object other) {
if ( this == other ) return true ;
if ( other == null ) return false ;
if ( ! ( other instanceof Lang ) )
@@ -142,8 +154,7 @@ public class Lang
@Override
public String toString() { return "Lang:"+label ; }
- public String toLongString()
- {
+ public String toLongString() {
String x = "Lang:" + label + " " + getContentType() ;
if (getAltNames().size() > 0)
x = x + " " + getAltNames() ;
@@ -161,8 +172,7 @@ public class Lang
* @deprecated Use {@link RDFLanguages#nameToLang(String)}
*/
@Deprecated
- public static Lang get(String name)
- {
+ public static Lang get(String name) {
Lang lang = RDFLanguages.nameToLang(name) ;
if ( lang == null )
throw new RiotException("No such language: "+name) ;
@@ -173,8 +183,7 @@ public class Lang
* @deprecated Use {@link RDFLanguages#nameToLang(String)}
*/
@Deprecated
- public static Lang get(String name, Lang dftLang)
- {
+ public static Lang get(String name, Lang dftLang) {
Lang lang = RDFLanguages.nameToLang(name) ;
if ( lang == null )
return dftLang ;
@@ -186,8 +195,7 @@ public class Lang
* @deprecated Use {@link RDFLanguages#filenameToLang(String,Lang)}
*/
@Deprecated
- public static Lang guess(String resourceIRI, Lang dftLang)
- {
+ public static Lang guess(String resourceIRI, Lang dftLang) {
return RDFLanguages.filenameToLang(resourceIRI, dftLang) ;
}
@@ -196,8 +204,7 @@ public class Lang
* @deprecated Use {@link RDFLanguages#filenameToLang(String)}
*/
@Deprecated
- public static Lang guess(String resourceIRI)
- {
+ public static Lang guess(String resourceIRI) {
return RDFLanguages.filenameToLang(resourceIRI) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java?rev=1551196&r1=1551195&r2=1551196&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java Mon Dec 16 12:22:24 2013
@@ -16,85 +16,92 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot ;
import org.apache.jena.atlas.lib.Lib ;
-/** Constants for writable formats */
-public class RDFFormat
-{
+/** Constants for writable formats */
+public class RDFFormat {
/** Pretty printing variant */
- public static RDFFormatVariant PRETTY = new RDFFormatVariant("pretty" ) ;
- /** Print in blocks, typically all triples with teh same subject in an incoming triple/quad stream */
- public static RDFFormatVariant BLOCKS = new RDFFormatVariant("blocks" ) ;
+ public static RDFFormatVariant PRETTY = new RDFFormatVariant("pretty") ;
+ /**
+ * Print in blocks, typically all triples with teh same subject in an
+ * incoming triple/quad stream
+ */
+ public static RDFFormatVariant BLOCKS = new RDFFormatVariant("blocks") ;
/** Print out one per line */
- public static RDFFormatVariant FLAT = new RDFFormatVariant("flat" ) ;
-
+ public static RDFFormatVariant FLAT = new RDFFormatVariant("flat") ;
+
/** Use ASCII output (N-triples, N-Quads) */
- public static RDFFormatVariant ASCII = new RDFFormatVariant("ascii") ;
+ public static RDFFormatVariant ASCII = new RDFFormatVariant("ascii") ;
/** Use UTF-8 output (N-triples, N-Quads) */
- public static RDFFormatVariant UTF8 = new RDFFormatVariant("utf-8") ;
-
- public static RDFFormat TURTLE_PRETTY = new RDFFormat(Lang.TURTLE, PRETTY) ;
- public static RDFFormat TURTLE = TURTLE_PRETTY ;
- public static RDFFormat TTL = TURTLE_PRETTY ;
- public static RDFFormat TURTLE_BLOCKS = new RDFFormat(Lang.TURTLE, BLOCKS) ;
- public static RDFFormat TURTLE_FLAT = new RDFFormat(Lang.TURTLE, FLAT) ;
-
- public static RDFFormat NTRIPLES_UTF8 = new RDFFormat(Lang.NTRIPLES, UTF8) ;
- public static RDFFormat NTRIPLES = NTRIPLES_UTF8 ;
- public static RDFFormat NT = NTRIPLES ;
- public static RDFFormat NTRIPLES_ASCII = new RDFFormat(Lang.NTRIPLES, ASCII) ;
-
- public static RDFFormat NQUADS_UTF8 = new RDFFormat(Lang.NQUADS, UTF8) ;
- public static RDFFormat NQUADS = NQUADS_UTF8 ;
- public static RDFFormat NQ = NQUADS ;
- public static RDFFormat NQUADS_ASCII = new RDFFormat(Lang.NQUADS, ASCII) ;
-
- public static RDFFormat TRIG_PRETTY = new RDFFormat(Lang.TRIG, PRETTY) ;
- public static RDFFormat TRIG = TRIG_PRETTY ;
- public static RDFFormat TRIG_BLOCKS = new RDFFormat(Lang.TRIG, BLOCKS) ;
- public static RDFFormat TRIG_FLAT = new RDFFormat(Lang.TRIG, FLAT) ;
-
- /** RDF/XML ABBREV variant*/
- public static RDFFormatVariant ABBREV = new RDFFormatVariant("pretty") ;
+ public static RDFFormatVariant UTF8 = new RDFFormatVariant("utf-8") ;
+
+ public static RDFFormat TURTLE_PRETTY = new RDFFormat(Lang.TURTLE, PRETTY) ;
+ public static RDFFormat TURTLE = TURTLE_PRETTY ;
+ public static RDFFormat TTL = TURTLE_PRETTY ;
+ public static RDFFormat TURTLE_BLOCKS = new RDFFormat(Lang.TURTLE, BLOCKS) ;
+ public static RDFFormat TURTLE_FLAT = new RDFFormat(Lang.TURTLE, FLAT) ;
+
+ public static RDFFormat NTRIPLES_UTF8 = new RDFFormat(Lang.NTRIPLES, UTF8) ;
+ public static RDFFormat NTRIPLES = NTRIPLES_UTF8 ;
+ public static RDFFormat NT = NTRIPLES ;
+ public static RDFFormat NTRIPLES_ASCII = new RDFFormat(Lang.NTRIPLES, ASCII) ;
+
+ public static RDFFormat NQUADS_UTF8 = new RDFFormat(Lang.NQUADS, UTF8) ;
+ public static RDFFormat NQUADS = NQUADS_UTF8 ;
+ public static RDFFormat NQ = NQUADS ;
+ public static RDFFormat NQUADS_ASCII = new RDFFormat(Lang.NQUADS, ASCII) ;
+
+ public static RDFFormat TRIG_PRETTY = new RDFFormat(Lang.TRIG, PRETTY) ;
+ public static RDFFormat TRIG = TRIG_PRETTY ;
+ public static RDFFormat TRIG_BLOCKS = new RDFFormat(Lang.TRIG, BLOCKS) ;
+ public static RDFFormat TRIG_FLAT = new RDFFormat(Lang.TRIG, FLAT) ;
+
+ public static RDFFormat JSONLD_PRETTY = new RDFFormat(Lang.JSONLD, PRETTY) ;
+ public static RDFFormat JSONLD = JSONLD_PRETTY ;
+ public static RDFFormat JSONLD_FLAT = new RDFFormat(Lang.JSONLD, FLAT) ;
+
+ /** RDF/XML ABBREV variant */
+ public static RDFFormatVariant ABBREV = new RDFFormatVariant("pretty") ;
/** Basic RDF/XML variant */
- public static RDFFormatVariant PLAIN = new RDFFormatVariant("plain") ;
-
- public static RDFFormat RDFXML_PRETTY = new RDFFormat(Lang.RDFXML, ABBREV) ;
- public static RDFFormat RDFXML_ABBREV = RDFXML_PRETTY ;
- public static RDFFormat RDFXML = RDFXML_PRETTY ;
- public static RDFFormat RDFXML_PLAIN = new RDFFormat(Lang.RDFXML, PLAIN) ;
-
- public static RDFFormat RDFJSON = new RDFFormat(Lang.RDFJSON) ;
-
- /** The "null" output format (a sink that prints nothing, usually quite efficiently) */
- public static RDFFormat RDFNULL = new RDFFormat(Lang.RDFNULL) ;
+ public static RDFFormatVariant PLAIN = new RDFFormatVariant("plain") ;
- private final Lang lang ;
+ public static RDFFormat RDFXML_PRETTY = new RDFFormat(Lang.RDFXML, ABBREV) ;
+ public static RDFFormat RDFXML_ABBREV = RDFXML_PRETTY ;
+ public static RDFFormat RDFXML = RDFXML_PRETTY ;
+ public static RDFFormat RDFXML_PLAIN = new RDFFormat(Lang.RDFXML, PLAIN) ;
+
+ public static RDFFormat RDFJSON = new RDFFormat(Lang.RDFJSON) ;
+
+ /**
+ * The "null" output format (a sink that prints nothing, usually quite
+ * efficiently)
+ */
+ public static RDFFormat RDFNULL = new RDFFormat(Lang.RDFNULL) ;
+
+ private final Lang lang ;
private final RDFFormatVariant variant ;
- public RDFFormat(Lang lang) { this(lang, null) ; }
-
- public RDFFormat(Lang lang, RDFFormatVariant variant)
- {
+ public RDFFormat(Lang lang) {
+ this(lang, null) ;
+ }
+
+ public RDFFormat(Lang lang, RDFFormatVariant variant) {
this.lang = lang ;
this.variant = variant ;
}
- public Lang getLang()
- {
+ public Lang getLang() {
return lang ;
}
- public RDFFormatVariant getVariant()
- {
+ public RDFFormatVariant getVariant() {
return variant ;
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31 ;
int result = 1 ;
result = prime * result + ((lang == null) ? 0 : lang.hashCode()) ;
@@ -103,25 +110,25 @@ public class RDFFormat
}
@Override
- public boolean equals(Object obj)
- {
- if (this == obj) return true ;
- if (obj == null) return false ;
- if (getClass() != obj.getClass()) return false ;
+ public boolean equals(Object obj) {
+ if ( this == obj )
+ return true ;
+ if ( obj == null )
+ return false ;
+ if ( getClass() != obj.getClass() )
+ return false ;
RDFFormat other = (RDFFormat)obj ;
- if ( ! Lib.equal(lang, other.lang) )
+ if ( !Lib.equal(lang, other.lang) )
return false ;
- if ( ! Lib.equal(variant, other.variant) )
+ if ( !Lib.equal(variant, other.variant) )
return false ;
return true ;
}
-
+
@Override
- public String toString()
- {
+ public String toString() {
if ( variant == null )
return lang.getName() ;
- return lang.getName()+"/"+variant ;
+ return lang.getName() + "/" + variant ;
}
}
-
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java?rev=1551196&r1=1551195&r2=1551196&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java Mon Dec 16 12:22:24 2013
@@ -16,24 +16,22 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot ;
import org.apache.jena.atlas.lib.Lib ;
import com.hp.hpl.jena.sparql.util.Symbol ;
-public class RDFFormatVariant
-{
+/** Modifier for an RDF Format */
+public class RDFFormatVariant {
private final Symbol symbol ;
-
- public RDFFormatVariant(String name)
- {
+
+ public RDFFormatVariant(String name) {
symbol = Symbol.create(name) ;
}
@Override
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31 ;
int result = 1 ;
result = prime * result + ((symbol == null) ? 0 : symbol.hashCode()) ;
@@ -41,19 +39,21 @@ public class RDFFormatVariant
}
@Override
- public boolean equals(Object obj)
- {
- if (this == obj) return true ;
- if (obj == null) return false ;
- if (getClass() != obj.getClass()) return false ;
+ public boolean equals(Object obj) {
+ if ( this == obj )
+ return true ;
+ if ( obj == null )
+ return false ;
+ if ( getClass() != obj.getClass() )
+ return false ;
RDFFormatVariant other = (RDFFormatVariant)obj ;
- if ( ! Lib.equal(symbol, other.symbol) ) return false ;
+ if ( !Lib.equal(symbol, other.symbol) )
+ return false ;
return true ;
}
@Override
- public String toString()
- {
+ public String toString() {
return symbol.getSymbol() ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1551196&r1=1551195&r2=1551196&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Mon Dec 16 12:22:24 2013
@@ -33,6 +33,7 @@ import com.hp.hpl.jena.util.FileUtils ;
/** Central registry of RDF langauges and syntaxes.
* @see RDFParserRegistry
+ * @see RDFFormat
*/
public class RDFLanguages
{
@@ -42,6 +43,7 @@ public class RDFLanguages
public static final String strLangNTriples = "N-Triples" ;
public static final String strLangN3 = "N3" ;
public static final String strLangRDFJSON = "RDF/JSON" ;
+ public static final String strLangJSONLD = "JSON-LD" ;
public static final String strLangNQuads = "N-Quads" ;
public static final String strLangTriG = "TriG" ;
@@ -55,19 +57,19 @@ public class RDFLanguages
* ".owx" is the OWL direct XML syntax.
*/
- /** RDF/XML */
+ /** <a href="http://www.w3.org/TR/REC-rdf-syntax/">RDF/XML</a> */
public static final Lang RDFXML = LangBuilder.create(strLangRDFXML, contentTypeRDFXML)
.addAltNames("RDFXML", "RDF/XML-ABBREV", "RDFXML-ABBREV")
.addFileExtensions("rdf", "owl", "xml")
.build() ;
- /** Turtle */
+ /** <a href="http://www.w3.org/TR/turtle/">Turtle</a>*/
public static final Lang TURTLE = LangBuilder.create(strLangTurtle, contentTypeTurtle)
.addAltNames("TTL")
.addAltContentTypes(contentTypeTurtleAlt1, contentTypeTurtleAlt2)
.addFileExtensions("ttl")
.build() ;
- /** Common abbreviation for TURTLE */
+ /** Alternative constant for {@linkplain #TURTLE} */
public static final Lang TTL = TURTLE ;
/** N3 (treat as Turtle) */
@@ -76,35 +78,41 @@ public class RDFLanguages
.addFileExtensions("n3")
.build() ;
- /** N-Triples */
+ /** <a href="http://www.w3.org/TR/n-triples/">N-Triples</a>*/
public static final Lang NTRIPLES = LangBuilder.create(strLangNTriples, contentTypeNTriples)
.addAltNames("NT", "NTriples", "NTriple", "N-Triple", "N-Triples")
// Remove? Causes more trouble than it's worth.
.addAltContentTypes(contentTypeNTriplesAlt)
.addFileExtensions("nt")
.build() ;
- /** Common abbreviation for NTRIPLES */
+ /** Alternative constant for {@linkplain #NTRIPLES} */
public static final Lang NT = NTRIPLES ;
- /** RDF/JSON (this is not JSON-LD) */
+ /** <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
+ public static Lang JSONLD = LangBuilder.create(strLangJSONLD, "application/ld+json")
+ .addFileExtensions("jsonld")
+ .build() ;
+
+ /** <a href="http://www.w3.org/TR/rdf-json/">RDF/JSON</a>. This is not <a href="http://www.w3.org/TR/json-ld/">JSON-LD</a>. */
public static final Lang RDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON)
.addAltNames("RDFJSON")
.addFileExtensions("rj", "json")
.build() ;
- /** TriG */
+ /** <a href="http://www.w3.org/TR/trig/">TriG</a> */
public static final Lang TRIG = LangBuilder.create(strLangTriG, contentTypeTriG)
.addAltContentTypes(contentTypeTriGAlt1, contentTypeTriGAlt2)
.addFileExtensions("trig")
.build() ;
- /** N-Quads */
+ /** <a href="http://www.w3.org/TR/n-quads">N-Quads</a> */
public static final Lang NQUADS = LangBuilder.create(strLangNQuads, contentTypeNQuads)
.addAltNames("NQ", "NQuads", "NQuad", "N-Quad", "N-Quads")
.addAltContentTypes(contentTypeNQuadsAlt1, contentTypeNQuadsAlt2)
.addFileExtensions("nq")
.build() ;
- /** Abbreviation for NQUADS */
+
+ /** Alternative constant {@linkplain #NQUADS} */
public static final Lang NQ = NQUADS ;
/** The "null" language */
@@ -139,6 +147,7 @@ public class RDFLanguages
Lang.N3 = RDFLanguages.N3 ;
Lang.TURTLE = RDFLanguages.TURTLE ;
Lang.TTL = RDFLanguages.TTL ;
+ Lang.JSONLD = RDFLanguages.JSONLD ;
Lang.RDFJSON = RDFLanguages.RDFJSON ;
Lang.NQUADS = RDFLanguages.NQUADS ;
Lang.NQ = RDFLanguages.NQ ;
@@ -155,6 +164,7 @@ public class RDFLanguages
register(N3) ;
register(NTRIPLES) ;
register(RDFJSON) ;
+ //register(JSONLD) ; -- Done separately based on avilability of the external dependency.
register(TRIG) ;
register(NQUADS) ;
register(RDFNULL) ;