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 2015/05/20 19:35:54 UTC
[1/4] jena git commit: Typo
Repository: jena
Updated Branches:
refs/heads/master 8d29aa137 -> 4791f7bee
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/52719208
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/52719208
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/52719208
Branch: refs/heads/master
Commit: 5271920885c8eefabca916b1bbf791b8c2d2ea4b
Parents: 8d29aa1
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 18:14:58 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 18:14:58 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/riotcmd/CmdLangParse.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/52719208/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index d95ec26..ea4dbe9 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -285,7 +285,7 @@ public abstract class CmdLangParse extends CmdGeneral
}
- /** Create a streaming outoput sink if possible */
+ /** Create a streaming output sink if possible */
protected StreamRDF createStreamSink() {
if ( modLangParse.toBitBucket() )
return StreamRDFLib.sinkNull() ;
[2/4] jena git commit: JENA-938: Code cleaning provided in PR#69 and
use of Java8 features.
Posted by an...@apache.org.
JENA-938: Code cleaning provided in PR#69 and use of Java8 features.
This closes #69.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1267edd3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1267edd3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1267edd3
Branch: refs/heads/master
Commit: 1267edd363db227290e242697e07302c0cb17817
Parents: 5271920
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 18:23:12 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 18:33:35 2015 +0100
----------------------------------------------------------------------
.../apache/jena/fuseki/mgt/ActionBackup.java | 35 +++----
.../jena/fuseki/servlets/SPARQL_REST.java | 4 +-
.../fuseki/servlets/SimpleVelocityServlet.java | 2 +-
.../apache/jena/fuseki/build/FusekiConfig.java | 5 +-
.../apache/jena/fuseki/mgt/ActionDatasets.java | 3 +-
.../apache/jena/fuseki/servlets/ActionBase.java | 4 +-
.../apache/jena/fuseki/servlets/ActionREST.java | 4 +-
.../jena/fuseki/servlets/FusekiFilter.java | 2 +-
.../jena/fuseki/servlets/SPARQL_Upload.java | 104 ++++++++-----------
.../org/apache/jena/fuseki/TestDatasetOps.java | 14 +--
10 files changed, 70 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
index c4bdcc6..443b3fc 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
@@ -94,26 +94,23 @@ public class ActionBackup extends ServletBase
FileOps.ensureDir(BackupArea) ;
try {
- final Callable<Boolean> task = new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception
+ final Callable<Boolean> task = () -> {
+ log.info(format("[%d] Start backup %s to '%s'", action.id, ds, filename)) ;
+ action.beginRead() ;
+ try {
+ backup(action.getActiveDSG(), filename) ;
+ log.info(format("[%d] Finish backup %s to '%s'", action.id, ds, filename)) ;
+ }
+ catch ( RuntimeException ex )
{
- log.info(format("[%d] Start backup %s to '%s'", action.id, ds, filename)) ;
- action.beginRead() ;
- try {
- backup(action.getActiveDSG(), filename) ;
- log.info(format("[%d] Finish backup %s to '%s'", action.id, ds, filename)) ;
- }
- catch ( RuntimeException ex )
- {
- log.info(format("[%d] Exception during backup: ", action.id, ex.getMessage()), ex) ;
- return Boolean.FALSE ;
- }
- finally {
- action.endRead() ;
- }
- return Boolean.TRUE ;
- }} ;
+ log.info(format("[%d] Exception during backup: ", action.id, ex.getMessage()), ex) ;
+ return Boolean.FALSE ;
+ }
+ finally {
+ action.endRead() ;
+ }
+ return Boolean.TRUE ;
+ } ;
log.info(format("[%d] Schedule backup %s to '%s'", action.id, ds, filename)) ;
backupService.submit(task) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
index aadbe49..d597ebb 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
@@ -20,12 +20,10 @@ package org.apache.jena.fuseki.servlets;
import static org.apache.jena.fuseki.HttpNames.* ;
-import java.io.IOException ;
import java.io.InputStream ;
import java.util.Enumeration ;
import java.util.Locale ;
-import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -160,7 +158,7 @@ public abstract class SPARQL_REST extends SPARQL_ServletBase
{ super() ; }
@Override
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void service(HttpServletRequest request, HttpServletResponse response) {
// Direct all verbs to our common framework.
doCommon(request, response) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
index 8773eba..93572ee 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
@@ -127,7 +127,7 @@ public class SimpleVelocityServlet extends HttpServlet
}
@Override
- public void init(RuntimeServices rs) throws Exception
+ public void init(RuntimeServices rs)
{ }
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index e7cf42b..549298a 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -208,12 +208,9 @@ public class FusekiConfig {
return Collections.emptyList() ;
}
// Files that are not hidden.
- DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
- @Override
- public boolean accept(Path entry) throws IOException {
+ DirectoryStream.Filter<Path> filter = (entry)-> {
File f = entry.toFile() ;
return ! f.isHidden() && f.isFile() ;
- }
} ;
List<DataAccessPoint> dataServiceRef = new ArrayList<>() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index dfd89ea..273d717 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -25,7 +25,6 @@ import java.util.HashMap ;
import java.util.Iterator ;
import java.util.Map ;
-import javax.servlet.ServletException ;
import javax.servlet.ServletOutputStream ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -90,7 +89,7 @@ public class ActionDatasets extends ActionContainerItem {
}
@Override
- protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doDelete(HttpServletRequest request, HttpServletResponse response) {
doCommon(request, response);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
index f19f951..0c58eac 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
@@ -24,7 +24,6 @@ import java.io.IOException ;
import java.util.Enumeration ;
import java.util.Map ;
-import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -187,8 +186,7 @@ public abstract class ActionBase extends ServletBase
return name ;
}
- @SuppressWarnings("unused") // ServletException
- protected void doPatch(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPatch(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "HTTP PATCH not supported");
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java
index e2c7e4a..3178a05 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionREST.java
@@ -18,10 +18,8 @@
package org.apache.jena.fuseki.servlets;
-import java.io.IOException ;
import java.util.Locale ;
-import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -34,7 +32,7 @@ public abstract class ActionREST extends ActionSPARQL
{ super() ; }
@Override
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void service(HttpServletRequest request, HttpServletResponse response) {
// Direct all verbs to our common framework.
doCommon(request, response) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/FusekiFilter.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/FusekiFilter.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/FusekiFilter.java
index 7a79cd3..46146d3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/FusekiFilter.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/FusekiFilter.java
@@ -37,7 +37,7 @@ public class FusekiFilter implements Filter {
private static SPARQL_UberServlet überServlet = new SPARQL_UberServlet.AccessByConfig() ;
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
// log.info("Filter: ["+Utils.className(this)+"] ServletContextName = "+filterConfig.getServletContext().getServletContextName()) ;
// log.info("Filter: ["+Utils.className(this)+"] ContextPath = "+filterConfig.getServletContext().getContextPath()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
index b7b1ca7..5314eed 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
@@ -20,12 +20,10 @@ package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
-import java.io.IOException ;
import java.io.InputStream ;
import java.io.PrintWriter ;
import java.util.zip.GZIPInputStream ;
-import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -59,24 +57,20 @@ public class SPARQL_Upload extends ActionSPARQL
// Methods to respond to.
@Override
- protected void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException
- {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) {
doCommon(request, response) ;
}
-
+
@Override
- protected void doOptions(HttpServletRequest request, HttpServletResponse response)
- {
- setCommonHeaders(response);
+ protected void doOptions(HttpServletRequest request, HttpServletResponse response) {
+ setCommonHeaders(response) ;
setCommonHeadersForOptions(response) ;
- response.setHeader(HttpNames.hAllow, "OPTIONS,POST");
+ response.setHeader(HttpNames.hAllow, "OPTIONS,POST") ;
response.setHeader(HttpNames.hContentLengh, "0") ;
}
@Override
- protected void perform(HttpAction action)
- {
+ protected void perform(HttpAction action) {
// Only allows one file in the upload.
boolean isMultipart = ServletFileUpload.isMultipartContent(action.request);
if ( ! isMultipart )
@@ -110,10 +104,9 @@ public class SPARQL_Upload extends ActionSPARQL
}
catch (Exception ex) { ServletOps.errorOccurred(ex) ; }
}
-
+
// Also used by SPARQL_REST
- static public long upload(HttpAction action, String base)
- {
+ static public long upload(HttpAction action, String base) {
if ( action.isTransactional() )
return uploadTxn(action, base) ;
else
@@ -189,59 +182,53 @@ public class SPARQL_Upload extends ActionSPARQL
// ?? Combine with Upload.fileUploadWorker
// Difference is the handling of names for graphs.
- static private UploadDetails uploadWorker(HttpAction action, String base)
- {
+ static private UploadDetails uploadWorker(HttpAction action, String base) {
DatasetGraph dsgTmp = DatasetGraphFactory.createMem() ;
- ServletFileUpload upload = new ServletFileUpload();
+ ServletFileUpload upload = new ServletFileUpload() ;
String graphName = null ;
boolean isQuads = false ;
long count = -1 ;
-
- String name = null ;
+
+ String name = null ;
ContentType ct = null ;
Lang lang = null ;
try {
- FileItemIterator iter = upload.getItemIterator(action.request);
+ FileItemIterator iter = upload.getItemIterator(action.request) ;
while (iter.hasNext()) {
- FileItemStream item = iter.next();
- String fieldName = item.getFieldName();
- InputStream stream = item.openStream();
- if (item.isFormField())
- {
+ FileItemStream item = iter.next() ;
+ String fieldName = item.getFieldName() ;
+ InputStream stream = item.openStream() ;
+ if ( item.isFormField() ) {
// Graph name.
String value = Streams.asString(stream, "UTF-8") ;
- if ( fieldName.equals(HttpNames.paramGraph) )
- {
+ if ( fieldName.equals(HttpNames.paramGraph) ) {
graphName = value ;
- if ( graphName != null && ! graphName.equals("") && ! graphName.equals(HttpNames.valueDefault) )
- {
+ if ( graphName != null && !graphName.equals("") && !graphName.equals(HttpNames.valueDefault) ) {
IRI iri = IRIResolver.parseIRI(value) ;
if ( iri.hasViolation(false) )
- ServletOps.errorBadRequest("Bad IRI: "+graphName) ;
+ ServletOps.errorBadRequest("Bad IRI: " + graphName) ;
if ( iri.getScheme() == null )
- ServletOps.errorBadRequest("Bad IRI: no IRI scheme name: "+graphName) ;
- if ( iri.getScheme().equalsIgnoreCase("http") || iri.getScheme().equalsIgnoreCase("https"))
- {
+ ServletOps.errorBadRequest("Bad IRI: no IRI scheme name: " + graphName) ;
+ if ( iri.getScheme().equalsIgnoreCase("http") || iri.getScheme().equalsIgnoreCase("https") ) {
// Redundant??
- if ( iri.getRawHost() == null )
- ServletOps.errorBadRequest("Bad IRI: no host name: "+graphName) ;
+ if ( iri.getRawHost() == null )
+ ServletOps.errorBadRequest("Bad IRI: no host name: " + graphName) ;
if ( iri.getRawPath() == null || iri.getRawPath().length() == 0 )
- ServletOps.errorBadRequest("Bad IRI: no path: "+graphName) ;
+ ServletOps.errorBadRequest("Bad IRI: no path: " + graphName) ;
if ( iri.getRawPath().charAt(0) != '/' )
- ServletOps.errorBadRequest("Bad IRI: Path does not start '/': "+graphName) ;
- }
+ ServletOps.errorBadRequest("Bad IRI: Path does not start '/': " + graphName) ;
+ }
}
- }
- else if ( fieldName.equals(HttpNames.paramDefaultGraphURI) )
+ } else if ( fieldName.equals(HttpNames.paramDefaultGraphURI) )
graphName = null ;
else
// Add file type?
action.log.info(format("[%d] Upload: Field=%s ignored", action.id, fieldName)) ;
} else {
// Process the input stream
- name = item.getName() ;
- if ( name == null || name.equals("") || name.equals("UNSET FILE NAME") )
+ name = item.getName() ;
+ if ( name == null || name.equals("") || name.equals("UNSET FILE NAME") )
ServletOps.errorBadRequest("No name for content - can't determine RDF syntax") ;
String contentTypeHeader = item.getContentType() ;
@@ -251,30 +238,31 @@ public class SPARQL_Upload extends ActionSPARQL
if ( lang == null ) {
lang = RDFLanguages.filenameToLang(name) ;
- //JENA-600 filenameToLang() strips off certain extensions such as .gz and
- //we need to ensure that if there was a .gz extension present we wrap the stream accordingly
- if (name.endsWith(".gz") )
- stream = new GZIPInputStream(stream);
+ // JENA-600 filenameToLang() strips off certain
+ // extensions such as .gz and
+ // we need to ensure that if there was a .gz extension
+ // present we wrap the stream accordingly
+ if ( name.endsWith(".gz") )
+ stream = new GZIPInputStream(stream) ;
}
-
-
+
if ( lang == null )
// Desperate.
lang = RDFLanguages.RDFXML ;
-
- isQuads = RDFLanguages.isQuads(lang) ;
- action.log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => %s",
- action.id, name, ct.getContentType(), ct.getCharset(), lang.getName())) ;
-
+ isQuads = RDFLanguages.isQuads(lang) ;
+
+ action.log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => %s", action.id, name,
+ ct.getContentType(), ct.getCharset(), lang.getName())) ;
+
StreamRDF x = StreamRDFLib.dataset(dsgTmp) ;
- StreamRDFCounting dest = StreamRDFLib.count(x) ;
- ActionSPARQL.parse(action, dest, stream, lang, base);
+ StreamRDFCounting dest = StreamRDFLib.count(x) ;
+ ActionSPARQL.parse(action, dest, stream, lang, base) ;
count = dest.count() ;
}
- }
+ }
- if ( graphName == null || graphName.equals("") )
+ if ( graphName == null || graphName.equals("") )
graphName = HttpNames.valueDefault ;
if ( isQuads )
graphName = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/1267edd3/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
index 8d08968..132f237 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestDatasetOps.java
@@ -21,12 +21,7 @@ package org.apache.jena.fuseki;
import static org.apache.jena.fuseki.ServerTest.serviceQuery ;
import static org.apache.jena.fuseki.ServerTest.serviceREST ;
import static org.apache.jena.fuseki.ServerTest.urlDataset ;
-
-import java.io.IOException ;
-import java.io.OutputStream ;
-
import org.apache.http.HttpEntity ;
-import org.apache.http.entity.ContentProducer ;
import org.apache.http.entity.EntityTemplate ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.web.HttpException ;
@@ -58,15 +53,8 @@ public class TestDatasetOps extends AbstractFusekiTest
/** Create an HttpEntity for the graph */
protected HttpEntity datasetToHttpEntity(final DatasetGraph dsg) {
-
final RDFFormat syntax = RDFFormat.NQUADS ;
- ContentProducer producer = new ContentProducer() {
- @Override
- public void writeTo(OutputStream out) throws IOException {
- RDFDataMgr.write(out, dsg, syntax) ;
- }
- } ;
- EntityTemplate entity = new EntityTemplate(producer) ;
+ EntityTemplate entity = new EntityTemplate((out) -> RDFDataMgr.write(out, dsg, syntax)) ;
String ct = syntax.getLang().getContentType().getContentType() ;
entity.setContentType(ct) ;
return entity ;
[4/4] jena git commit: This closes #58.
Posted by an...@apache.org.
This closes #58.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4791f7be
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4791f7be
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4791f7be
Branch: refs/heads/master
Commit: 4791f7bee288e355cc7513d9acbb35e98215ca36
Parents: 7926cec
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 18:35:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 18:35:41 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] jena git commit: JENA-938: Code cleaning provided in PR#70 and
use of Java8 features.
Posted by an...@apache.org.
JENA-938: Code cleaning provided in PR#70 and use of Java8 features.
This closes #70.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7926cec1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7926cec1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7926cec1
Branch: refs/heads/master
Commit: 7926cec16178614270b917a77c0aa13dcb4f4c66
Parents: 1267edd
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 18:30:56 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 18:34:59 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sdb/layout1/TupleLoaderSimple.java | 6 ++----
.../jena/sdb/layout2/hash/TupleLoaderOneHash.java | 2 +-
.../java/org/apache/jena/sdb/sql/DataSourceSDB.java | 14 +++++++-------
.../java/org/apache/jena/sdb/store/FeatureSet.java | 3 +--
.../apache/jena/query/spatial/EntityDefinition.java | 2 --
.../java/org/apache/jena/tdb/junit/QueryTestTDB.java | 2 +-
6 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/TupleLoaderSimple.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/TupleLoaderSimple.java b/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/TupleLoaderSimple.java
index bf3947e..a0b53d2 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/TupleLoaderSimple.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/TupleLoaderSimple.java
@@ -18,8 +18,6 @@
package org.apache.jena.sdb.layout1;
-import java.sql.SQLException;
-
import org.apache.jena.graph.Node ;
import org.apache.jena.sdb.core.sqlexpr.SqlConstant ;
import org.apache.jena.sdb.sql.SDBConnection ;
@@ -40,13 +38,13 @@ public class TupleLoaderSimple extends TupleLoaderOne
}
@Override
- public SqlConstant getRefForNode(Node node) throws SQLException
+ public SqlConstant getRefForNode(Node node)
{
return new SqlConstant(codec.encode(node)) ;
}
@Override
- public SqlConstant insertNode(Node node) throws SQLException
+ public SqlConstant insertNode(Node node)
{
return new SqlConstant(codec.encode(node)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/hash/TupleLoaderOneHash.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/hash/TupleLoaderOneHash.java b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/hash/TupleLoaderOneHash.java
index 91cf96a..c65b407 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/hash/TupleLoaderOneHash.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/hash/TupleLoaderOneHash.java
@@ -51,7 +51,7 @@ public class TupleLoaderOneHash extends TupleLoaderOne
@Override
- public SqlConstant getRefForNode(Node node) throws SQLException
+ public SqlConstant getRefForNode(Node node)
{
return new SqlConstant(NodeLayout2.hash(node)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-sdb/src/main/java/org/apache/jena/sdb/sql/DataSourceSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/DataSourceSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/DataSourceSDB.java
index 597c567..1675e95 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/sql/DataSourceSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/sql/DataSourceSDB.java
@@ -39,13 +39,13 @@ public class DataSourceSDB implements DataSource
}
@Override
- public Connection getConnection() throws SQLException
+ public Connection getConnection()
{
return getConnection(null, null) ;
}
@Override
- public Connection getConnection(String username, String password) throws SQLException
+ public Connection getConnection(String username, String password)
{
// All the work!
return SDBConnectionFactory.create(sdbConnDesc).getSqlConnection() ;
@@ -58,16 +58,16 @@ public class DataSourceSDB implements DataSource
{ throw new SQLFeatureNotSupportedException() ; }
@Override
- public PrintWriter getLogWriter() throws SQLException
+ public PrintWriter getLogWriter()
{ return printWriter ; }
@Override
- public void setLogWriter(PrintWriter out) throws SQLException
+ public void setLogWriter(PrintWriter out)
{ printWriter = out ; }
@Override
- public int getLoginTimeout() throws SQLException
+ public int getLoginTimeout()
{
// 0 means default to "system timeout"
return 0 ;
@@ -75,13 +75,13 @@ public class DataSourceSDB implements DataSource
@Override
- public void setLoginTimeout(int seconds) throws SQLException
+ public void setLoginTimeout(int seconds)
{
// Ignore. Efficiently.
}
@Override
- public boolean isWrapperFor(Class<? > iface) throws SQLException
+ public boolean isWrapperFor(Class<? > iface)
{
// We do not wrap anything.
return false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-sdb/src/main/java/org/apache/jena/sdb/store/FeatureSet.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/FeatureSet.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/FeatureSet.java
index 4e098d2..66316d8 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/FeatureSet.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/FeatureSet.java
@@ -23,13 +23,12 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.io.Printable ;
import org.apache.jena.atlas.io.PrintableBase ;
import org.apache.jena.atlas.iterator.Iter ;
/** A set of features (order retained */
-public class FeatureSet extends PrintableBase implements Printable, Iterable<Feature>
+public class FeatureSet extends PrintableBase implements Iterable<Feature>
{
List <Feature> features = new ArrayList<Feature>() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java
index f2f86cd..77daf6c 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java
@@ -20,7 +20,6 @@ package org.apache.jena.query.spatial;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -34,7 +33,6 @@ import com.spatial4j.core.context.SpatialContextFactory;
/**
* Definition of a "document"
*/
-@SuppressWarnings("unused")
public class EntityDefinition {
private final String entityField;
http://git-wip-us.apache.org/repos/asf/jena/blob/7926cec1/jena-tdb/src/test/java/org/apache/jena/tdb/junit/QueryTestTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/junit/QueryTestTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/junit/QueryTestTDB.java
index 98e1e62..d9ecc22 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/junit/QueryTestTDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/junit/QueryTestTDB.java
@@ -120,7 +120,7 @@ public class QueryTestTDB extends EarlTestCase
@Override
- protected void runTestForReal() throws Throwable
+ protected void runTestForReal()
{
if ( skipThisTest )
{