From 5e652ee862e6125ef8756e140955ed2fd1e36cbf Mon Sep 17 00:00:00 2001 From: Andy Seaborne Date: Sat, 21 Sep 2019 15:58:07 +0100 Subject: [PATCH 1/2] Clean up javadoc and other warnings --- .../org/apache/jena/atlas/iterator/Iter.java | 6 ++--- .../java/org/apache/jena/graph/GraphUtil.java | 2 +- .../apache/jena/dboe/storage/StorageRDF.java | 8 +++---- .../dboe/storage/prefixes/PrefixMapI.java | 2 +- .../jena/arq/querybuilder/ExprFactory.java | 10 ++++---- .../jena/arq/querybuilder/UpdateBuilder.java | 8 ++----- .../querybuilder/handlers/ValuesHandler.java | 4 ---- .../arq/querybuilder/ExprFactoryTest.java | 9 +++---- .../UpdateBuilderExampleTests.java | 24 +++++++++---------- .../rewriters/NodeValueRewriterTest.java | 14 ++--------- .../fuseki/server/ActionServiceFactory.java | 2 +- .../org/apache/jena/jdbc/utils/TestUtils.java | 4 ++-- pom.xml | 20 +++++++++++++++- 13 files changed, 55 insertions(+), 58 deletions(-) diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java index 93a8637dbab..17da1342196 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java @@ -381,7 +381,7 @@ public static int step(Iterator iter, int steps) { } /** Take the first N elements of an iterator - stop early if too few - * @See {@link #limit(Iterator, long)} + * @see #limit(Iterator, long) */ public static List take(Iterator iter, int N) { iter = new IteratorN<>(iter, N) ; @@ -438,8 +438,8 @@ public static Iterator dropUntil(Iterator iter, Predicate predicate } /** Return an iterator that is limited to the given number of elements. - * If it is shorter, (or less). - * @See {@link #take(Iterator, int)} + * If it is shorter than the limit, stop at the end. + * @see #take(Iterator, int) */ public static Iterator limit(Iterator iterator, long limit) { final Iterator iter = new Iterator() { diff --git a/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java b/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java index c8b0220bad1..c297b0a7d4e 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java +++ b/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java @@ -297,7 +297,7 @@ private static void deleteIteratorWorkerDirect(Graph graph, Iterator it) *

* It is not designed for a large {@code srcGraph} and large {@code dstGraph} * with only a few triples in common to delete from {@code dstGraph}. It is better to - * calculate the difference in some way, and copy into a small graph to use as the {@srcGraph}. + * calculate the difference in some way, and copy into a small graph to use as the {@code srcGraph}. *

* To force delete by looping on {@code srcGraph}, use {@link #deleteLoopSrc(Graph, Graph)}. *

diff --git a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StorageRDF.java b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StorageRDF.java index b85ad5b0a7e..905ed34ec5a 100644 --- a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StorageRDF.java +++ b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StorageRDF.java @@ -44,14 +44,14 @@ * Various API operations work on "concrete" terms. For example, {@code add}. These are * marked "concrete operation" in their javadoc. They are not matching operations. A * concrete term is one of a URI, blank node or literal. It is not {@code null}, - * {@code Node.ANY} nor a named variable. Any {@code Triple} or {@code Quad} must be + * {@code Node#ANY} nor a named variable. Any {@code Triple} or {@code Quad} must be * composed of concrete terms. *

* A pattern operation is one where the arguments are concrete terms or wildcard - * {@code.ANY}. Such an operation will match zero or more triples or quads. + * {@code ANY}. Such an operation will match zero or more triples or quads. * Any {@code Triple} or {@code Quad} can use {@code.ANY}. *

Pattern operations do not match named variables. - * Using {@code Node.ANY} rather than {@code null} is preferred in pattern operations but + * Using {@code Node#ANY} rather than {@code null} is preferred in pattern operations but * both are acceptable. */ public interface StorageRDF { @@ -73,7 +73,7 @@ public default void add(Quad quad) public default void delete(Triple triple) { delete(triple.getSubject(), triple.getPredicate(), triple.getObject()); } - /** Delete a quad from the default graph. All terms are concrete, and not {@code Node.ANY}. + /** Delete a quad from the default graph. All terms are concrete, and not {@code Node#ANY}. * For delete-by-pattern, see {@link #removeAll(Node, Node, Node, Node)}. *

Concrete operation. */ diff --git a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapI.java b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapI.java index 5fe31329089..6837580160b 100644 --- a/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapI.java +++ b/jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapI.java @@ -26,7 +26,7 @@ /** Implementation-view of prefix mappings. * - * @apiNotes + * @apiNote *

See {@link StoragePrefixMap} for the storage implementation view. *

See {@link PrefixMapBase} for an implementation over {@link StoragePrefixMap} */ diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java index 0bce323a21b..ef2e5a25588 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java @@ -1656,8 +1656,8 @@ public final E_Exists exists(WhereClause whereClause) { * * @see org.apache.jena.sparql.expr.E_NotExists * - * @param args - * the arguments to the function. + * @param whereClause + * the argument to the function. * @return an E_NotExists instance. */ public final E_NotExists notexists(WhereClause whereClause) { @@ -1685,7 +1685,7 @@ public final ExprNone none() { *

  • otherwise create an ExprVar from {AbstractQuerybuilder.makeVar} * * - * @see {@link AbstractQueryBuilder#makeVar(Object)} + * @see AbstractQueryBuilder#makeVar(Object) * * @param o * the object to convert. @@ -1757,8 +1757,8 @@ public final String quote(String s) { *
  • otherwise calls var()
    • * * - * @see {@link #asVar(Object)} - * @see {@link AbstractQueryBuilder#makeVar(Object)} + * @see #asVar(Object) + * @see AbstractQueryBuilder#makeVar(Object) * * @param o * the object to create the expression from diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java index 273d067bd22..66569dbd926 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java @@ -851,10 +851,9 @@ public UpdateBuilder addWhere(TriplePath t) throws IllegalArgumentException { } /** - * Add the triple path to the where clause + * Add the WhereClause * - * @param t - * The triple path to add. + * @param whereClause * @throws IllegalArgumentException * If the triple path is not a valid triple path for a where * clause. @@ -984,9 +983,6 @@ public UpdateBuilder addBind(String expression, Var var) throws ParseException { * * @param objs * the list of objects for the list. - * - * @param objs - * the list of objects for the list. * @return the first blank node in the list. */ public Node list(Object... objs) { diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java index 8e40e9030d0..d0862030d38 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java @@ -48,9 +48,6 @@ public class ValuesHandler implements Handler { /** * Constructor. - * - * @param query - * The query to manipulate. */ public ValuesHandler() { this( null ); @@ -152,7 +149,6 @@ public void addValueVar(Var var, Collection nodes) { * * @param values * the collection of values to add. - * @return The builder for chaining. */ public void addValueRow(Collection values) { if (values.size() != valuesTable.size()) { diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java index a1e8dc73eca..468cccb03aa 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java @@ -442,22 +442,19 @@ public void bnodeTest() { @Test public void exprListTest() { ExprList e = factory.list(); - assertTrue(e instanceof ExprList); - + assertNotNull(e); } @Test public void exprListTest_OneArg() { ExprList e = factory.asList(factory.none()); - assertTrue(e instanceof ExprList); - + assertNotNull(e); } @Test public void exprListTest_MultipleArg() { ExprList e = factory.asList(factory.none(), factory.none()); - assertTrue(e instanceof ExprList); - + assertNotNull(e); } @Test diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java index 0ce95c7a16f..4cb55aaa5b4 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java @@ -78,7 +78,7 @@ public void setup() { /** * Example 1: Adding some triples to a graph * - * @see https://www.w3.org/TR/sparql11-update/#example_1 + * @see sparql11-update example_1 */ @Test public void example1() { @@ -107,7 +107,7 @@ public void example1() { /** * Example 2: Adding some triples to a graph * - * @see https://www.w3.org/TR/sparql11-update/#example_2 + * @see sparql11-update example_2 */ @Test public void example2() { @@ -134,7 +134,7 @@ public void example2() { /** * Example 3: Removing triples from a graph * - * @see https://www.w3.org/TR/sparql11-update/#example_3 + * @see sparql11-update example_3 */ @Test public void example3() { @@ -163,7 +163,7 @@ public void example3() { /** * Example 4: * - * @see https://www.w3.org/TR/sparql11-update/#example_4 + * @see sparql11-update example_4 */ @Test public void example4() { @@ -201,7 +201,7 @@ public void example4() { /** * Example 5: * - * @see https://www.w3.org/TR/sparql11-update/#example_5 + * @see sparql11-update example_5 */ @Test public void example5() { @@ -239,7 +239,7 @@ public void example5() { /** * Example 6: * - * @see https://www.w3.org/TR/sparql11-update/#example_6 + * @see sparql11-update example_6 */ @Test public void example6() { @@ -292,7 +292,7 @@ public void example6() { /** * Example 7: * - * @see https://www.w3.org/TR/sparql11-update/#example_7 + * @see sparql11-update example_7 */ @Test public void example7() { @@ -331,7 +331,7 @@ public void example7() { /** * Example 8: * - * @see https://www.w3.org/TR/sparql11-update/#example_8 + * @see sparql11-update example_8 */ @Test public void example8() { @@ -412,7 +412,7 @@ public void example8() { /** * Example 9: * - * @see https://www.w3.org/TR/sparql11-update/#example_9 + * @see sparql11-update example_9 */ @Test public void example9() { @@ -474,7 +474,7 @@ public void example9() { /** * Example 10: * - * @see https://www.w3.org/TR/sparql11-update/#example_10 + * @see sparql11-update example_10 */ @Test public void example10() { @@ -545,7 +545,7 @@ public void example10() { /** * Example 11: * - * @see https://www.w3.org/TR/sparql11-update/#example_11 + * @see sparql11-update example_11 */ @Test public void example11() { @@ -577,7 +577,7 @@ public void example11() { /** * Example 12: * - * @see https://www.w3.org/TR/sparql11-update/#example_12 + * @see sparql11-update example_12 */ @Test public void example12() { diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java index faaf249cc7d..0b6b875afb6 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java @@ -34,17 +34,7 @@ import org.apache.jena.sparql.core.Var ; import org.apache.jena.sparql.expr.NodeValue; -import org.apache.jena.sparql.expr.nodevalue.NodeValueBoolean; -import org.apache.jena.sparql.expr.nodevalue.NodeValueDT; -import org.apache.jena.sparql.expr.nodevalue.NodeValueDecimal; -import org.apache.jena.sparql.expr.nodevalue.NodeValueDouble; -import org.apache.jena.sparql.expr.nodevalue.NodeValueDuration; -import org.apache.jena.sparql.expr.nodevalue.NodeValueFloat; -import org.apache.jena.sparql.expr.nodevalue.NodeValueInteger; -import org.apache.jena.sparql.expr.nodevalue.NodeValueLang; -import org.apache.jena.sparql.expr.nodevalue.NodeValueNode; -import org.apache.jena.sparql.expr.nodevalue.NodeValueSortKey; -import org.apache.jena.sparql.expr.nodevalue.NodeValueString; +import org.apache.jena.sparql.expr.nodevalue.*; import org.apache.jena.sparql.graph.NodeConst; import org.apache.jena.sparql.util.Utils; import org.junit.Test; @@ -82,7 +72,7 @@ public void visitNodeValueDecimalTest() { @Test public void visitNodeValueDecimalNodeTest() { - Node n = NodeFactory.createLiteral(Utils.stringForm(new BigDecimal( 3.14 )), XSDDatatype.XSDdecimal) ; + Node n = NodeFactory.createLiteral(XSDFuncOp.canonicalDecimalStr(new BigDecimal( 3.14 )), XSDDatatype.XSDdecimal) ; NodeValue nv = new NodeValueDecimal( new BigDecimal( 3.14 ), n ); nv.visit( rewriter ); NodeValue result = rewriter.getResult(); diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ActionServiceFactory.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ActionServiceFactory.java index c9f7fdee745..bf396db2f29 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ActionServiceFactory.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ActionServiceFactory.java @@ -36,7 +36,7 @@ @FunctionalInterface public interface ActionServiceFactory { /** - * Create an {@linkService} (which can be shared with endpoints), given the description + * Create an {@link ActionServiceFactory} (it can be shared with endpoints), given the description * which is a link into the server configuration graph. */ public ActionService newActionService(Operation operation, Resource endpoint); diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/utils/TestUtils.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/utils/TestUtils.java index 85ba9974273..61a826e5e08 100644 --- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/utils/TestUtils.java +++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/utils/TestUtils.java @@ -136,8 +136,8 @@ public static void copyToRemoteDataset(Dataset source, String service) { * Source Dataset * @param service * Remote Graph Store protocol service - * @param authenticator - * HTTP Authenticator + * @param client + * HTTP Client */ public static void copyToRemoteDataset(Dataset source, String service, HttpClient client) { DatasetAccessor target = DatasetAccessorFactory.createHTTP(service, client); diff --git a/pom.xml b/pom.xml index 92ce440ead1..e563ad08ffa 100644 --- a/pom.xml +++ b/pom.xml @@ -875,7 +875,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.1.1 attach-javadocs @@ -911,6 +911,24 @@ https://jena.apache.org/documentation/javadoc/permissions/ https://jena.apache.org/documentation/javadoc/jdbc/ + + + + apiNote + a + API Note: + + + implSpec + a + Implementation Requirements: + + + implNote + a + Implementation Note: + + From 41cfdddc53e2514523a0c8fdefa595409773ef03 Mon Sep 17 00:00:00 2001 From: Andy Seaborne Date: Sat, 21 Sep 2019 17:21:12 +0100 Subject: [PATCH 2/2] Set Elasticsearch console logging to 'warn' --- jena-text-es/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml index 18cd374a8ed..4d7f8d270b7 100644 --- a/jena-text-es/pom.xml +++ b/jena-text-es/pom.xml @@ -146,6 +146,8 @@ 9400 ${es.startup.timeout} ${ver.elasticsearch} + + WARN