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 2014/07/02 17:05:57 UTC
svn commit: r1607391 - in
/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets:
REST_Quads_RW.java SPARQL_GSP_RW.java SPARQL_Upload.java ServletOps.java
Upload.java
Author: andy
Date: Wed Jul 2 15:05:57 2014
New Revision: 1607391
URL: http://svn.apache.org/r1607391
Log:
JSON results for quads upload
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_RW.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_RW.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_RW.java?rev=1607391&r1=1607390&r2=1607391&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_RW.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads_RW.java Wed Jul 2 15:05:57 2014
@@ -76,11 +76,12 @@ public class REST_Quads_RW extends REST_
}
private void doPutPostTxn(HttpAction action, boolean clearFirst) {
+ UploadDetails details = null ;
action.beginWrite() ;
try {
DatasetGraph dsg = action.getActiveDSG() ;
StreamRDF dest = StreamRDFLib.dataset(dsg) ;
- UploadDetails details = Upload.incomingData(action, dest) ;
+ details = Upload.incomingData(action, dest) ;
action.commit() ;
ServletOps.success(action) ;
} catch (RiotException ex) {
@@ -94,6 +95,7 @@ public class REST_Quads_RW extends REST_
} finally {
action.endWrite() ;
}
+ ServletOps.uploadResponse(action, details) ;
}
private void doPutPostNonTxn(HttpAction action, boolean clearFirst) {
@@ -124,6 +126,6 @@ public class REST_Quads_RW extends REST_
} finally {
action.endWrite() ;
}
-
+ ServletOps.uploadResponse(action, details) ;
}
}
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java?rev=1607391&r1=1607390&r2=1607391&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java Wed Jul 2 15:05:57 2014
@@ -20,7 +20,6 @@ package org.apache.jena.fuseki.servlets;
import static org.apache.jena.riot.WebContent.ctMultipartMixed ;
import static org.apache.jena.riot.WebContent.matchContentType ;
-import org.apache.jena.atlas.json.JsonValue ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
@@ -103,13 +102,7 @@ public class SPARQL_GSP_RW extends SPARQ
ServletOps.successNoContent(action) ;
return ;
}
-
- if ( details.getExistedBefore().equals(PreState.ABSENT) )
- ServletOps.successCreated(action) ;
- else
- ServletOps.success(action) ; // successNoContent if empty body.
- JsonValue v = details.detailsJson() ;
- ServletOps.sendJson(action, v) ;
+ ServletOps.uploadResponse(action, details) ;
}
/** Directly add data in a transaction.
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1607391&r1=1607390&r2=1607391&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Wed Jul 2 15:05:57 2014
@@ -130,7 +130,6 @@ public class SPARQL_Upload extends Actio
if ( graphName == null )
action.log.info(format("[%d] Upload: %d Quads(s)",action.id, count)) ;
-
else
action.log.info(format("[%d] Upload: Graph: %s, %d triple(s)", action.id, graphName, count)) ;
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java?rev=1607391&r1=1607390&r2=1607391&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java Wed Jul 2 15:05:57 2014
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonValue ;
+import org.apache.jena.fuseki.servlets.UploadDetails.PreState ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpNames ;
import org.apache.jena.web.HttpSC ;
@@ -195,6 +196,14 @@ public class ServletOps {
} catch (IOException ex) { ServletOps.errorOccurred(ex) ; }
}
-
+ /** response to a upload operation of some kind. */
+ public static void uploadResponse(HttpAction action, UploadDetails details) {
+ if ( details.getExistedBefore().equals(PreState.ABSENT) )
+ ServletOps.successCreated(action) ;
+ else
+ ServletOps.success(action) ; // successNoContent if empty body.
+ JsonValue v = details.detailsJson() ;
+ ServletOps.sendJson(action, v) ;
+ }
}
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/Upload.java?rev=1607391&r1=1607390&r2=1607391&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/Upload.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/Upload.java Wed Jul 2 15:05:57 2014
@@ -44,6 +44,11 @@ import org.apache.jena.riot.system.Strea
public class Upload {
public static UploadDetails incomingData(HttpAction action, StreamRDF dest) {
ContentType ct = FusekiLib.getContentType(action) ;
+
+ if ( ct == null ) {
+ ServletOps.errorBadRequest("No content type") ;
+ return null ;
+ }
if ( matchContentType(ctMultipartFormData, ct) ) {
return fileUploadWorker(action, dest) ;