Further code review
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/237d3382 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/237d3382 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/237d3382 Branch: refs/heads/master Commit: 237d33826b8b0361243e967dfce806fd0c9b1d7b Parents: 334bf48 Author: ajs6f <[email protected]> Authored: Fri Oct 21 13:48:49 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:32 2016 -0400 ---------------------------------------------------------------------- .../jena/atlas/io/AbstractTestPeekInputStream.java | 4 ++-- .../org/apache/jena/fuseki/mgt/ActionDatasets.java | 14 ++++++-------- .../apache/jena/fuseki/validation/DataValidator.java | 4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/237d3382/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java index 1b9acb3..a639099 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java @@ -152,7 +152,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest @Test public void unread3() { PeekInputStream in = make("") ; - in.readByte() ; + /* int ch = */ in.readByte() ; assertEquals(-1, in.peekByte()) ; in.pushbackByte('a') ; contains(in, "a") ; @@ -161,7 +161,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest @Test public void unread4() { PeekInputStream in = make("") ; - in.readByte() ; + /* int ch = */ in.readByte() ; assertEquals(-1, in.peekByte()) ; in.pushbackByte('0') ; in.pushbackByte('1') ; http://git-wip-us.apache.org/repos/asf/jena/blob/237d3382/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 b176c1a..97e52cc 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 @@ -178,8 +178,6 @@ public class ActionDatasets extends ActionContainerItem { datasetPath = DataAccessPoint.canonical(datasetName) ; } action.log.info(format("[%d] Create database : name = %s", action.id, datasetPath)) ; -// System.err.println("'"+datasetPath+"'") ; -// DataAccessPointRegistry.get().forEach((s,dap)->System.err.println("'"+s+"'")); // ---- Check whether it already exists if ( action.getDataAccessPointRegistry().isRegistered(datasetPath) ) // And abort. @@ -250,14 +248,14 @@ public class ActionDatasets extends ActionContainerItem { //dSrv.activate() ; } else if ( s.equalsIgnoreCase("offline") ) { action.log.info(format("[%d] OFFLINE DATASET %s", action.id, name)) ; - DataAccessPoint access = action.getDataAccessPoint() ; + //DataAccessPoint access = action.getDataAccessPoint() ; //access.goOffline() ; dSrv.goOffline() ; // Affects the target of the name. setDatasetState(name, FusekiVocab.stateOffline) ; //dSrv.offline() ; } else if ( s.equalsIgnoreCase("unlink") ) { action.log.info(format("[%d] UNLINK ACCESS NAME %s", action.id, name)) ; - DataAccessPoint access = action.getDataAccessPoint() ; + //DataAccessPoint access = action.getDataAccessPoint() ; ServletOps.errorNotImplemented("unlink: dataset"+action.getDatasetName()); //access.goOffline() ; // Registry? @@ -267,11 +265,11 @@ public class ActionDatasets extends ActionContainerItem { return null ; } - private void assemblerFromBody(HttpAction action, StreamRDF dest) { + private static void assemblerFromBody(HttpAction action, StreamRDF dest) { bodyAsGraph(action, dest) ; } - private void assemblerFromForm(HttpAction action, StreamRDF dest) { + private static void assemblerFromForm(HttpAction action, StreamRDF dest) { String dbType = action.getRequest().getParameter(paramDatasetType) ; String dbName = action.getRequest().getParameter(paramDatasetName) ; if ( StringUtils.isBlank(dbType) || StringUtils.isBlank(dbName) ) @@ -297,7 +295,7 @@ public class ActionDatasets extends ActionContainerItem { RDFDataMgr.parse(dest, new StringReader(template), "http://base/";, Lang.TTL) ; } - private void assemblerFromUpload(HttpAction action, StreamRDF dest) { + private static void assemblerFromUpload(HttpAction action, StreamRDF dest) { Upload.fileUploadWorker(action, dest); } @@ -361,7 +359,7 @@ public class ActionDatasets extends ActionContainerItem { } // Persistent state change. - private void setDatasetState(String name, Resource newState) { + private static void setDatasetState(String name, Resource newState) { boolean committed = false ; system.begin(ReadWrite.WRITE) ; try { http://git-wip-us.apache.org/repos/asf/jena/blob/237d3382/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java index 4e1c48a..80f2c7e 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java @@ -102,7 +102,9 @@ public class DataValidator extends ValidatorBaseJson { return "RDF Data" ; } - // Error handler that records messages + /** + * Error handler that records messages. + */ @SuppressWarnings("unused") private static class ErrorHandlerMsg implements ErrorHandler {
