Code review
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2e12eac5 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2e12eac5 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2e12eac5 Branch: refs/heads/master Commit: 2e12eac54da261453cc98d5c2f15185c3c73ce42 Parents: ca9021f Author: ajs6f <[email protected]> Authored: Fri Oct 21 12:00:06 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:31 2016 -0400 ---------------------------------------------------------------------- .../sparql/engine/iterator/QueryIterTopN.java | 2 +- .../org/apache/jena/atlas/io/BlockUTF8.java | 8 +++++ .../atlas/io/AbstractTestPeekInputStream.java | 2 +- .../java/org/apache/jena/atlas/lib/TestHex.java | 2 +- .../jena/atlas/lib/cache/TestCacheSimple.java | 7 ++-- .../apache/jena/fuseki/server/FusekiServer.java | 17 ++++++++++ .../jena/fuseki/validation/DataValidator.java | 34 ++++++++++++++++++++ .../java/org/apache/jena/fuseki/FileSender.java | 2 +- .../java/org/apache/jena/fuseki/TestQuery.java | 9 ++---- .../jena/permissions/impl/SecuredItemImpl.java | 4 +-- 10 files changed, 72 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java index 3bd8a67..9abe980 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java @@ -74,7 +74,7 @@ public class QueryIterTopN extends QueryIterPlainWrapper } // Keep heap with maximum accessible. - this.heap = new PriorityQueue<>((int)numItems, new ReverseComparator<>(comparator)) ; + this.heap = new PriorityQueue<>((int)numItems, comparator.reversed()) ; this.setIterator(sortTopN(qIter, comparator)) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java index a8401cb..cb71faf 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java @@ -153,6 +153,10 @@ public class BlockUTF8 } } + private static void toCharsArray(byte[] bytes, char[] chars) { + toCharsBuffer(ByteBuffer.wrap(bytes), CharBuffer.wrap(chars)); + } + private static void fromCharsBuffer(CharBuffer cb, ByteBuffer bb) { // CharBuffers are CharSequences but charAt(i) adds a layer of work. @@ -225,6 +229,10 @@ public class BlockUTF8 { fromChars(CharBuffer.wrap(cs), bb) ; } + + private static void fromCharsArray(char[] chars, byte[] bytes) { + fromCharsBuffer(CharBuffer.wrap(chars), ByteBuffer.wrap(bytes)); + } private static int readMultiBytes(ByteBuffer input, int start, int len) { http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/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 4b1945a..1b9acb3 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 @@ -139,7 +139,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest { PeekInputStream in = make("abc") ; checkLineCol(in, INIT_LINE, INIT_COL) ; - in.readByte() ; + /* int ch = */ in.readByte() ; // Pushback does not move line/col backwards. checkLineCol(in, INIT_LINE, INIT_COL+1) ; assertEquals('b', in.peekByte()) ; http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java index e6bb895..002a813 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java @@ -85,7 +85,7 @@ public class TestHex extends BaseTest } private static void testStr2Val(String str, int start, int length, int expected) { - Hex.hexStringToInt(str, start, length) ; + /* int i = */ Hex.hexStringToInt(str, start, length) ; } @Test public void hexValue_01() { testStr2Val("A", 10); } http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java index cd94f99..4263a27 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java @@ -43,14 +43,15 @@ public class TestCacheSimple extends BaseTest { @Test public void testReplace() { + final Integer key = 1 ; final String value1 = "A" ; final String value2 = "B" ; final Cache<Integer, Object> testCache = new CacheSimple<>(5); - testCache.put(1, value1); - testCache.put(1, value2); + testCache.put(key, value1); + testCache.put(key, value2); assertEquals("Wrong size", 1, testCache.size()) ; - assertEquals("Wrong slot contents", value2, testCache.getIfPresent(1)) ; + assertEquals("Wrong slot contents", value2, testCache.getIfPresent(key)) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/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 4cf74da..6575527 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 @@ -367,6 +367,23 @@ 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 emptyDir(Path dir) { + return dir.toFile().list().length <= 2 ; + } + + 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/2e12eac5/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 6796f5c..4e1c48a 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,11 +18,17 @@ 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 ; @@ -95,6 +101,34 @@ public class DataValidator extends ValidatorBaseJson { protected String validatorName() { return "RDF Data" ; } + + // Error handler that records messages + @SuppressWarnings("unused") + 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/2e12eac5/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 f2b057e..58af429 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 @@ -80,7 +80,7 @@ public class FileSender { ps.print("--" + boundary + "--"+WNL); } connection.connect(); - connection.getResponseCode(); + int responseCode = connection.getResponseCode(); } catch (IOException ex) { IO.exception(ex); } } } http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/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 1b4c958..f439bca 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,11 +39,7 @@ 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 ; @@ -260,7 +256,7 @@ public class TestQuery extends AbstractFusekiTest { } } - private void execQuery(String queryString, int exceptedRowCount) { + private static void execQuery(String queryString, int exceptedRowCount) { try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery(), queryString) ) { ResultSet rs = qExec.execSelect() ; int x = ResultSetFormatter.consume(rs) ; @@ -268,11 +264,12 @@ public class TestQuery extends AbstractFusekiTest { } } - private void execQuery(String queryString, ResultSet expectedResultSet) { + private static void execQuery(String queryString, ResultSet expectedResultSet) { try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery(), queryString) ) { ResultSet rs = qExec.execSelect() ; boolean b = ResultSetCompare.equalsByTerm(rs, expectedResultSet) ; assertTrue("Result sets different", b) ; } } + } http://git-wip-us.apache.org/repos/asf/jena/blob/2e12eac5/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java index 036f753..ef66219 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java @@ -300,7 +300,7 @@ public abstract class SecuredItemImpl implements SecuredItem { * @return the value of the security check or <code>null</code> if the value * has not been cached. */ - private static Boolean cacheGet(final CacheKey key) { + private Boolean cacheGet(final CacheKey key) { final LRUMap<CacheKey, Boolean> cache = SecuredItemImpl.CACHE.get(); return (cache == null) ? null : (Boolean) cache.get(key); } @@ -313,7 +313,7 @@ public abstract class SecuredItemImpl implements SecuredItem { * @param value * The value to set. */ - private static void cachePut(final CacheKey key, final boolean value) { + private void cachePut(final CacheKey key, final boolean value) { final LRUMap<CacheKey, Boolean> cache = SecuredItemImpl.CACHE.get(); if (cache != null) { cache.put(key, value);
