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/02/12 21:56:59 UTC
svn commit: r1445354 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/Lang.java
main/java/org/apache/jena/riot/RDFLanguages.java
test/java/org/apache/jena/riot/lang/TestLang.java
Author: andy
Date: Tue Feb 12 20:56:58 2013
New Revision: 1445354
URL: http://svn.apache.org/r1445354
Log:
Add some very short names. Test registry.
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/RDFLanguages.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.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=1445354&r1=1445353&r2=1445354&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 Tue Feb 12 20:56:58 2013
@@ -43,13 +43,28 @@ public class Lang
// public static final Lang TRIG = RDFLanguages.TriG ;
// To avoid an initialization circularity, these are set by RDFLanguages.
+ static { RDFLanguages.init() ; }
- public static Lang RDFXML ;
+ /** RDF/XML */
+ 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 */
+ 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 ;
- public static Lang NQUADS ;
+ /** NQuads */
+ public static Lang NQUADS ;
+ /** NQuads */
+ public static Lang NQ ;
+ /** TriG */
public static Lang TRIG ;
public static Lang RDFNULL ;
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=1445354&r1=1445353&r2=1445354&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 Tue Feb 12 20:56:58 2013
@@ -72,6 +72,9 @@ public class RDFLanguages
.addFileExtensions("ttl")
//.addFileExtensions("n3")
.build() ;
+ /** Common abbreviation for TURTLE */
+ public static final Lang TTL = TURTLE ;
+
/** N3 (treat as Turtle) */
public static final Lang N3 = LangBuilder.create(strLangN3, contentTypeN3)
.addAltContentTypes(contentTypeN3, contentTypeN3Alt1, contentTypeN3Alt2)
@@ -84,6 +87,8 @@ public class RDFLanguages
.addAltContentTypes(contentTypeNTriplesAlt)
.addFileExtensions("nt")
.build() ;
+ /** Common abbreviation for NTRIPLES */
+ public static final Lang NT = NTRIPLES ;
/** RDF/JSON (this is not JSON-LD) */
public static final Lang RDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON)
@@ -103,6 +108,8 @@ public class RDFLanguages
.addAltContentTypes(contentTypeNQuadsAlt1, contentTypeNQuadsAlt2)
.addFileExtensions("nq")
.build() ;
+ /** Abbreviation for NQUADS */
+ public static final Lang NQ = NQUADS ;
/** The "null" language */
public static final Lang RDFNULL = LangBuilder.create("rdf/null", "null/rdf")
@@ -131,11 +138,14 @@ public class RDFLanguages
initStandard() ;
// Needed to avoid a class initialization loop.
Lang.RDFXML = RDFLanguages.RDFXML ;
- Lang.NTRIPLES = RDFLanguages.NTRIPLES ;
+ Lang.NTRIPLES = RDFLanguages.NTRIPLES ;
+ Lang.NT = RDFLanguages.NT ;
Lang.N3 = RDFLanguages.N3 ;
- Lang.TURTLE = RDFLanguages.TURTLE ;
+ Lang.TURTLE = RDFLanguages.TURTLE ;
+ Lang.TTL = RDFLanguages.TTL ;
Lang.RDFJSON = RDFLanguages.RDFJSON ;
- Lang.NQUADS = RDFLanguages.NQUADS ;
+ Lang.NQUADS = RDFLanguages.NQUADS ;
+ Lang.NQ = RDFLanguages.NQ ;
Lang.TRIG = RDFLanguages.TRIG ;
Lang.RDFNULL = RDFLanguages.RDFNULL ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java?rev=1445354&r1=1445353&r2=1445354&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java Tue Feb 12 20:56:58 2013
@@ -32,7 +32,34 @@ import com.hp.hpl.jena.util.FileUtils ;
public class TestLang extends BaseTest
{
- static { RDFLanguages.init() ; }
+ @Test public void registration_01() { testregistration(RDFLanguages.RDFXML) ; }
+ @Test public void registration_02() { testregistration(RDFLanguages.NTRIPLES) ; }
+ @Test public void registration_03() { testregistration(RDFLanguages.NT) ; }
+ @Test public void registration_04() { testregistration(RDFLanguages.N3) ; }
+ @Test public void registration_05() { testregistration(RDFLanguages.TURTLE) ; }
+ @Test public void registration_06() { testregistration(RDFLanguages.TTL) ; }
+ @Test public void registration_07() { testregistration(RDFLanguages.RDFJSON) ; }
+ @Test public void registration_08() { testregistration(RDFLanguages.NQUADS) ; }
+ @Test public void registration_09() { testregistration(RDFLanguages.NQ) ; }
+ @Test public void registration_10() { testregistration(RDFLanguages.TRIG) ; }
+ @Test public void registration_11() { testregistration(RDFLanguages.RDFNULL) ; }
+
+ @Test public void registration_01a() { testregistration(Lang.RDFXML) ; }
+ @Test public void registration_02a() { testregistration(Lang.NTRIPLES) ; }
+ @Test public void registration_03a() { testregistration(Lang.NT) ; }
+ @Test public void registration_04a() { testregistration(Lang.N3) ; }
+ @Test public void registration_05a() { testregistration(Lang.TURTLE) ; }
+ @Test public void registration_06a() { testregistration(Lang.TTL) ; }
+ @Test public void registration_07a() { testregistration(Lang.RDFJSON) ; }
+ @Test public void registration_08a() { testregistration(Lang.NQUADS) ; }
+ @Test public void registration_09a() { testregistration(Lang.NQ) ; }
+ @Test public void registration_10a() { testregistration(Lang.TRIG) ; }
+ @Test public void registration_11a() { testregistration(Lang.RDFNULL) ; }
+
+ private void testregistration(Lang lang)
+ {
+ assertTrue("No registration for "+lang, RDFLanguages.getRegisteredLanguages().contains(lang)) ;
+ }
@Test public void lang_01()
{ assertEquals(RDFLanguages.TURTLE, RDFLanguages.shortnameToLang("TTL")) ; }