Removing dead code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5eba725 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5eba725 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5eba725 Branch: refs/heads/master Commit: b5eba7256bc95eb4f15db6533679fdef6fd49c59 Parents: 63a78bf Author: ajs6f <[email protected]> Authored: Sat Oct 8 15:28:53 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:31 2016 -0400 ---------------------------------------------------------------------- .../org/apache/jena/fuseki/async/AsyncPool.java | 2 +- .../apache/jena/fuseki/build/FusekiConfig.java | 20 ------------ .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 7 ----- .../apache/jena/fuseki/mgt/ActionAsyncTask.java | 3 -- .../org/apache/jena/fuseki/mgt/ActionCtl.java | 3 -- .../apache/jena/fuseki/mgt/ActionDatasets.java | 6 +--- .../apache/jena/fuseki/server/FusekiServer.java | 17 ---------- .../jena/fuseki/validation/DataValidator.java | 33 -------------------- .../fuseki/validation/ValidatorBaseJson.java | 4 --- 9 files changed, 2 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java index a593e56..fe1f50b 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java @@ -53,7 +53,7 @@ public class AsyncPool Fuseki.serverLog.info(format("Task : %s : %s",taskId, displayName)) ; Callable<Object> c = Executors.callable(task) ; AsyncTask asyncTask = new AsyncTask(c, this, taskId, displayName, dataService, requestId) ; - Future<Object> x = executor.submit(asyncTask) ; + executor.submit(asyncTask) ; runningTasks.put(taskId, asyncTask) ; return asyncTask ; } http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/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 5082bf0..b422383 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 @@ -22,7 +22,6 @@ import static org.apache.jena.riot.RDFLanguages.filenameToLang; import static org.apache.jena.riot.RDFParserRegistry.isRegistered; import java.io.File ; -import java.io.FilenameFilter ; import java.io.IOException ; import java.lang.reflect.Method ; import java.nio.file.DirectoryStream ; @@ -48,9 +47,6 @@ import org.apache.jena.query.ResultSet ; import org.apache.jena.rdf.model.* ; import org.apache.jena.riot.Lang; import org.apache.jena.sparql.core.assembler.AssemblerUtils ; -import org.apache.jena.update.UpdateAction ; -import org.apache.jena.update.UpdateFactory ; -import org.apache.jena.update.UpdateRequest ; import org.apache.jena.vocabulary.RDF ; import org.slf4j.Logger ; @@ -59,17 +55,6 @@ public class FusekiConfig { private static Logger log = Fuseki.configLog ; - private static FilenameFilter visibleFiles = - new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - if ( name.startsWith(".") ) - return false ; - File f = new File(dir, name) ; - return f.isFile() ; - } - } ; - /** Has side effects in server setup */ public static List<DataAccessPoint> readServerConfigFile(String filename) { // Old-style config file. @@ -162,11 +147,6 @@ public class FusekiConfig { return AssemblerUtils.readAssemblerFile(filename) ; } - private static void execute(Model m, String x) { - UpdateRequest req = UpdateFactory.create(x) ; - UpdateAction.execute(req, m); - } - // XXX Move to a library private static List<Resource> getByType(Resource type, Model m) { ResIterator rIter = m.listSubjectsWithProperty(RDF.type, type) ; http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java index 04fcd70..565a8f6 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java @@ -331,13 +331,6 @@ public class FusekiCmd { } } - private static String sort_out_dir(String path) { - path.replace('\\', '/') ; - if ( !path.endsWith("/") ) - path = path + "/" ; - return path ; - } - @Override protected void exec() { try { http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java index 3cc5448..0d6da40 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionAsyncTask.java @@ -30,9 +30,6 @@ public abstract class ActionAsyncTask extends ActionItem { private static final long serialVersionUID = 4522916022736091383L; - // ?? Better as a library (mixin) so can be used outside ActionItem - private static AsyncPool asyncPool = AsyncPool.get() ; - public ActionAsyncTask() { super() ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java index d78517d..456f97b 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java @@ -20,7 +20,6 @@ package org.apache.jena.fuseki.mgt; import org.apache.jena.fuseki.Fuseki ; import org.apache.jena.fuseki.server.DataAccessPoint ; -import org.apache.jena.fuseki.server.DataService ; import org.apache.jena.fuseki.servlets.ActionBase ; import org.apache.jena.fuseki.servlets.HttpAction ; import org.apache.jena.fuseki.servlets.ServletOps ; @@ -36,7 +35,6 @@ public abstract class ActionCtl extends ActionBase final protected void execCommonWorker(HttpAction action) { DataAccessPoint dataAccessPoint ; - DataService dSrv ; String datasetUri = mapRequestToDatasetName(action) ; if ( datasetUri != null ) { @@ -50,7 +48,6 @@ public abstract class ActionCtl extends ActionBase // This is a placeholder when creating new DatasetRefs // and also if addressing a container, not a dataset dataAccessPoint = null ; - dSrv = DataService.serviceOnlyDataService() ; } action.setControlRequest(dataAccessPoint, datasetUri) ; http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/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 1c4deea..b176c1a 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 @@ -29,7 +29,6 @@ import java.util.Iterator ; import java.util.List ; import java.util.Map ; -import javax.servlet.ServletOutputStream ; import javax.servlet.http.HttpServletRequest ; import org.apache.commons.lang3.StringUtils; @@ -111,8 +110,6 @@ public class ActionDatasets extends ActionContainerItem { @Override protected JsonValue execPostContainer(HttpAction action) { JenaUUID uuid = JenaUUID.generate() ; - String newURI = uuid.asURI() ; - Node gn = NodeFactory.createURI(newURI) ; DatasetDescriptionRegistry registry = FusekiServer.registryForBuild() ; ContentType ct = FusekiLib.getContentType(action) ; @@ -208,7 +205,6 @@ public class ActionDatasets extends ActionContainerItem { DataAccessPoint ref = FusekiBuilder.buildDataAccessPoint(subject, registry) ; action.getDataAccessPointRegistry().register(datasetPath, ref) ; action.getResponse().setContentType(WebContent.contentTypeTextPlain); - ServletOutputStream out = action.getResponse().getOutputStream() ; ServletOps.success(action) ; system.commit(); committed = true ; @@ -430,7 +426,7 @@ public class ActionDatasets extends ActionContainerItem { try { input = request.getInputStream() ; } catch (IOException ex) { IO.exception(ex) ; } - int len = request.getContentLength() ; +// int len = request.getContentLength() ; // if ( verbose ) { // if ( len >= 0 ) // alog.info(format("[%d] Body: Content-Length=%d, Content-Type=%s, Charset=%s => %s", action.id, len, http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java index 6adbf0d..0e32f39 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java @@ -162,10 +162,6 @@ public class FusekiServer } } - private static boolean emptyDir(Path dir) { - return dir.toFile().list().length <= 2 ; - } - /** Copy a file from src to dst under name fn. * If src is null, try as a classpath resource * @param src Source directory, or null meaning use java resource. @@ -371,19 +367,6 @@ public class FusekiServer throw new FusekiConfigException("Not a directory: "+directory) ; } - private static void mustExist(Path directory) { - File dir = directory.toFile() ; - if ( ! dir.exists() ) - throw new FusekiConfigException("Does not exist: "+directory) ; - if ( ! dir.isDirectory()) - throw new FusekiConfigException("Not a directory: "+directory) ; - } - - private static boolean exists(Path directory) { - File dir = directory.toFile() ; - return dir.exists() ; - } - private static Path writeableDirectory(Path root , String relName ) { Path p = makePath(root, relName) ; ensureDir(p); http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/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 f91b2ef..6796f5c 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 @@ -18,17 +18,11 @@ package org.apache.jena.fuseki.validation; -import static org.apache.jena.riot.SysRIOT.fmtMessage ; - import java.io.StringReader ; -import java.util.ArrayList ; -import java.util.List ; - import org.apache.jena.atlas.json.JsonBuilder ; import org.apache.jena.atlas.json.JsonObject ; import org.apache.jena.fuseki.servlets.ServletOps ; import org.apache.jena.riot.* ; -import org.apache.jena.riot.system.ErrorHandler ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; @@ -101,33 +95,6 @@ public class DataValidator extends ValidatorBaseJson { protected String validatorName() { return "RDF Data" ; } - - // Error handler that records messages - private static class ErrorHandlerMsg implements ErrorHandler - { - private List<String> messages = new ArrayList<>() ; - - ErrorHandlerMsg(List<String> messages) { this.messages = messages; } - - @Override - public void warning(String message, long line, long col) - { output(message, line, col, "Warning", "warning") ; } - - // Attempt to continue. - @Override - public void error(String message, long line, long col) - { output(message, line, col, "Error", "error") ; } - - @Override - public void fatal(String message, long line, long col) - { output(message, line, col, "Fatal", "error") ; throw new RiotException(fmtMessage(message, line, col)) ; } - - private void output(String message, long line, long col, String typeName, String className) - { - String str = fmtMessage(message, line, col) ; - messages.add(str) ; - } - } } http://git-wip-us.apache.org/repos/asf/jena/blob/b5eba725/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java index 801602a..cc1e537 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java @@ -29,9 +29,7 @@ import javax.servlet.http.HttpServletResponse ; import org.apache.jena.atlas.json.JSON ; import org.apache.jena.atlas.json.JsonObject ; import org.apache.jena.fuseki.Fuseki ; -import org.apache.jena.query.ARQ ; import org.apache.jena.riot.web.HttpNames ; -import org.apache.jena.sparql.util.Context ; import org.apache.jena.fuseki.servlets.ActionErrorException ; import org.apache.jena.fuseki.servlets.ActionLib ; import org.apache.jena.fuseki.servlets.ServletBase ; @@ -72,7 +70,6 @@ public abstract class ValidatorBaseJson extends ServletBase response = action.response ; initResponse(request, response) ; - Context cxt = ARQ.getContext() ; try { JsonObject obj = execute(action) ; @@ -132,7 +129,6 @@ public abstract class ValidatorBaseJson extends ServletBase { long time = action.getTime() ; - HttpServletResponse response = action.response ; if ( action.verbose ) { // if ( action.contentType != null )
