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/93e21f00 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/93e21f00 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/93e21f00 Branch: refs/heads/master Commit: 93e21f00a41b6ee7b88e8fbcd25aa3761e0aa754 Parents: b5eba72 Author: ajs6f <[email protected]> Authored: Sat Oct 8 15:38:45 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:31 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/jena/fuseki/FileSender.java | 4 ++-- .../java/org/apache/jena/fuseki/TestAdmin.java | 22 +++++++++----------- .../java/org/apache/jena/fuseki/TestQuery.java | 4 ++++ 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/93e21f00/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java index 8381ab5..e1292e7 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java @@ -79,8 +79,8 @@ public class FileSender { } ps.print("--" + boundary + "--"+WNL); } - connection.connect(); - int responseCode = connection.getResponseCode(); + connection.connect(); + connection.getResponseCode(); } catch (IOException ex) { IO.exception(ex); } } } http://git-wip-us.apache.org/repos/asf/jena/blob/93e21f00/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java index f447960..e84e3e2 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java @@ -235,9 +235,7 @@ public class TestAdmin extends AbstractFusekiTest { @Test public void stats_3() { addTestDataset() ; - FusekiTest.exec404(()->{ - JsonValue v = execGetJSON(ServerCtl.urlRoot()+"$/"+opStats+"/DoesNotExist") ; - }) ; + FusekiTest.exec404(()-> execGetJSON(ServerCtl.urlRoot()+"$/"+opStats+"/DoesNotExist")) ; deleteDataset(dsTest) ; } @@ -307,7 +305,7 @@ public class TestAdmin extends AbstractFusekiTest { } } - private JsonValue getTask(String taskId) { + private static JsonValue getTask(String taskId) { String url = ServerCtl.urlRoot()+"$/tasks/"+taskId ; return httpGetJson(url) ; } @@ -353,8 +351,8 @@ public class TestAdmin extends AbstractFusekiTest { } } - - private String execSleepTask(String name, int millis) { + + private static String execSleepTask(String name, int millis) { String url = ServerCtl.urlRoot()+"$/sleep" ; if ( name != null ) { if ( name.startsWith("/") ) @@ -369,19 +367,19 @@ public class TestAdmin extends AbstractFusekiTest { return id ; } - private JsonValue httpGetJson(String url) { + private static JsonValue httpGetJson(String url) { JsonResponseHandler x = new JsonResponseHandler() ; HttpOp.execHttpGet(url, WebContent.contentTypeJSON, x) ; return x.getJSON() ; } - - private void checkTask(String x) { + + private static void checkTask(String x) { String url = ServerCtl.urlRoot()+"$/tasks/"+x ; JsonValue v = httpGetJson(url) ; checkTask(v) ; } - private void checkTask(JsonValue v) { + private static void checkTask(JsonValue v) { assertNotNull(v) ; assertTrue(v.isObject()) ; //System.out.println(v) ; @@ -395,8 +393,8 @@ public class TestAdmin extends AbstractFusekiTest { throw ex ; } } - - private void checkInTasks(String x) { + + private static void checkInTasks(String x) { String url = ServerCtl.urlRoot()+"$/tasks" ; JsonValue v = httpGetJson(url) ; assertTrue(v.isArray()) ; http://git-wip-us.apache.org/repos/asf/jena/blob/93e21f00/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java index 5651b77..1b4c958 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestQuery.java @@ -39,7 +39,11 @@ import org.apache.jena.sparql.core.Quad ; import org.apache.jena.sparql.core.Var ; import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.engine.http.QueryEngineHTTP ; +<<<<<<< HEAD import org.apache.jena.sparql.resultset.ResultSetCompare ; +======= +import org.apache.jena.sparql.sse.Item ; +>>>>>>> Removing dead code import org.apache.jena.sparql.sse.SSE ; import org.apache.jena.sparql.util.Convert ; import org.junit.Assert ;
