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/20 11:42:35 UTC
svn commit: r1448067 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/engine/http/
main/java/org/apache/jena/riot/ main/java/org/apache/jena/riot/adapters/
test/java/org/apache/jena/riot/
Author: andy
Date: Wed Feb 20 10:42:34 2013
New Revision: 1448067
URL: http://svn.apache.org/r1448067
Log:
Align to adding "N-Triples" as a reader name.
Move Jena RDFreader classes to adapter to get them out of the public API package (they have to be access public classes)
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1448067&r1=1448066&r2=1448067&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Wed Feb 20 10:42:34 2013
@@ -27,10 +27,7 @@ import java.util.Map ;
import java.util.concurrent.TimeUnit ;
import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.* ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -276,7 +273,7 @@ public class QueryEngineHTTP implements
Lang lang = WebContent.contentTypeToLang(actualContentType);
if (! RDFLanguages.isTriples(lang))
throw new QueryException("Endpoint returned Content Type: " + actualContentType + " which is not a valid RDF Graph syntax");
- model.read(in, null, lang.getName()) ;
+ RDFDataMgr.read(model, in, lang) ;
this.close() ;
return model ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java?rev=1448067&r1=1448066&r2=1448067&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java Wed Feb 20 10:42:34 2013
@@ -18,8 +18,7 @@
package org.apache.jena.riot;
-import org.apache.jena.atlas.web.ContentType ;
-import org.apache.jena.riot.adapters.RDFReaderRIOT ;
+import org.apache.jena.riot.adapters.JenaReadersWriters ;
import org.apache.jena.riot.system.JenaWriterRdfJson ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -44,6 +43,7 @@ public class IO_Jena
// RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", readerRDF) ;
//
// RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", readerRDF) ;
+// RDFReaderFImpl.setBaseReaderClassName("N-Triples", readerRDF) ;
// RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", readerRDF) ;
// RDFReaderFImpl.setBaseReaderClassName("N3", readerRDF) ;
// RDFReaderFImpl.setBaseReaderClassName("TURTLE", readerRDF) ;
@@ -51,31 +51,23 @@ public class IO_Jena
// RDFReaderFImpl.setBaseReaderClassName("TTL", readerRDF) ;
// RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", readerRDF) ;
- RDFReaderFImpl.setBaseReaderClassName("RDF/XML", RDFReaderRIOT_RDFXML.class.getName()) ; // And default
- RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", RDFReaderRIOT_RDFXML.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("RDF/XML", JenaReadersWriters.RDFReaderRIOT_RDFXML.class.getName()) ; // And default
+ RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", JenaReadersWriters.RDFReaderRIOT_RDFXML.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", RDFReaderRIOT_NT.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", RDFReaderRIOT_NT.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("N3", RDFReaderRIOT_TTL.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("TURTLE", RDFReaderRIOT_TTL.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("Turtle", RDFReaderRIOT_TTL.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("TTL", RDFReaderRIOT_TTL.class.getName()) ;
- RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", RDFReaderRIOT_RDFJSON.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", JenaReadersWriters.RDFReaderRIOT_NT.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-Triples", JenaReadersWriters.RDFReaderRIOT_NT.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", JenaReadersWriters.RDFReaderRIOT_NT.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("N3", JenaReadersWriters.RDFReaderRIOT_TTL.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("TURTLE", JenaReadersWriters.RDFReaderRIOT_TTL.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("Turtle", JenaReadersWriters.RDFReaderRIOT_TTL.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("TTL", JenaReadersWriters.RDFReaderRIOT_TTL.class.getName()) ;
+ RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", JenaReadersWriters.RDFReaderRIOT_RDFJSON.class.getName()) ;
// Old style Jena writers.
String writerRdfJson = JenaWriterRdfJson.class.getName() ;
RDFWriterFImpl.setBaseWriterClassName("RDF/JSON", writerRdfJson) ;
}
- // Yukky hack to integrate into current jena-core where the structure of model.read assumes
- // the language is determined before the reading process starts.
- // Temporary - eventually, replace all model.read calls with the correct call to RIOT
- // and then the common RDFReaderRIOT can be used.
- public static class RDFReaderRIOT_RDFXML extends RDFReaderRIOT { public RDFReaderRIOT_RDFXML() { super("RDF/XML") ; } }
- public static class RDFReaderRIOT_TTL extends RDFReaderRIOT { public RDFReaderRIOT_TTL() { super("TTL") ; } }
- public static class RDFReaderRIOT_NT extends RDFReaderRIOT { public RDFReaderRIOT_NT() { super("N-TRIPLE") ; } }
- public static class RDFReaderRIOT_RDFJSON extends RDFReaderRIOT { public RDFReaderRIOT_RDFJSON() { super("RDF/JSON") ; } }
-
static String jenaNTriplesReader = "com.hp.hpl.jena.rdf.model.impl.NTripleReader" ;
static String jenaTurtleReader = "com.hp.hpl.jena.n3.turtle.TurtleReader" ;
static String jenaN3Reader = jenaTurtleReader ;
@@ -83,6 +75,7 @@ public class IO_Jena
public static void resetJenaReaders()
{
RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", jenaNTriplesReader) ;
+ RDFReaderFImpl.setBaseReaderClassName("N-Triples", jenaNTriplesReader) ;
RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE", jenaNTriplesReader) ;
RDFReaderFImpl.setBaseReaderClassName("N3", jenaTurtleReader) ;
@@ -94,26 +87,5 @@ public class IO_Jena
RDFWriterFImpl.setBaseWriterClassName("RDF/JSON", "") ;
}
-
- protected static ContentType determineCT(String target, String ctStr, Lang hintLang)
- {
- if ( ctStr != null )
- ctStr = WebContent.contentTypeCanonical(ctStr) ;
-
- boolean isTextPlain = WebContent.contentTypeTextPlain.equals(ctStr) ;
- ContentType ct = (ctStr==null) ? null : ContentType.parse(ctStr) ;
-
- // It's it's text plain, we ignore it because some
- // server setups return text/plain for any file type.
-
- if ( ct == null || isTextPlain )
- {
- if ( hintLang == null )
- ct = RDFLanguages.guessContentType(target) ;
- else
- ct = hintLang.getContentType() ;
- }
- return ct ;
- }
}
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java?rev=1448067&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java Wed Feb 20 10:42:34 2013
@@ -0,0 +1,34 @@
+/**
+ * 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.adapters;
+
+public class JenaReadersWriters
+{
+
+ // Yukky hack to integrate into current jena-core where the structure of model.read assumes
+ // the language is determined before the reading process starts.
+ // Temporary - eventually, replace all model.read calls with the correct call to RIOT
+ // and then the common RDFReaderRIOT can be used.
+ public static class RDFReaderRIOT_RDFXML extends RDFReaderRIOT { public RDFReaderRIOT_RDFXML() { super("RDF/XML") ; } }
+ public static class RDFReaderRIOT_TTL extends RDFReaderRIOT { public RDFReaderRIOT_TTL() { super("TTL") ; } }
+ public static class RDFReaderRIOT_NT extends RDFReaderRIOT { public RDFReaderRIOT_NT() { super("N-TRIPLE") ; } }
+ public static class RDFReaderRIOT_RDFJSON extends RDFReaderRIOT { public RDFReaderRIOT_RDFJSON() { super("RDF/JSON") ; } }
+
+}
+
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1448067&r1=1448066&r2=1448067&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Wed Feb 20 10:42:34 2013
@@ -60,15 +60,16 @@ public class TestJenaReaderRIOT extends
@Test public void read_04() { jenaread("D.rdf") ; }
@Test public void read_05() { jenaread("D.json") ; }
- @Test public void read_11() { jenaread("D.nt", "N-TRIPLES") ; }
- @Test public void read_12() { jenaread("D.ttl", "TTL") ; }
- @Test public void read_13() { jenaread("D.rdf", "RDF/XML") ; }
- @Test public void read_14() { jenaread("D.rdf", "RDF/XML-ABBREV") ; }
+ @Test public void read_11() { jenaread("D.nt", "N-TRIPLES") ; }
+ @Test public void read_12() { jenaread("D.ttl", "TTL") ; }
+ @Test public void read_13() { jenaread("D.rdf", "RDF/XML") ; }
+ @Test public void read_14() { jenaread("D.rdf", "RDF/XML-ABBREV") ; }
@Test public void read_15() { jenaread("D.json", "RDF/JSON") ; }
@Test public void read_21a() { jenaread("D-nt", "N-TRIPLES") ; }
@Test public void read_21b() { jenaread("D-nt", "NTRIPLES") ; }
@Test public void read_21c() { jenaread("D-nt", "NT") ; }
+ @Test public void read_21d() { jenaread("D-nt", "N-Triples") ; }
@Test public void read_22a() { jenaread("D-ttl", "TURTLE") ; }
@Test public void read_22b() { jenaread("D-ttl", "TTL") ; }