Clean javadoc

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 <T> List<T> take(Iterator<T> iter, int N) {
         iter = new IteratorN<>(iter, N) ;
@@ -438,8 +438,8 @@ public static <T> Iterator<T> dropUntil(Iterator<T> iter, Predicate<T> 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 <X> Iterator<X> limit(Iterator<X> iterator, long limit) {
         final Iterator<X> iter = new Iterator<X>() {

jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java

@@ -297,7 +297,7 @@ private static void deleteIteratorWorkerDirect(Graph graph, Iterator<Triple> it)
      *  <p>  
      *  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}.  
      *  <p>
      *  To force delete by looping on {@code srcGraph}, use {@link #deleteLoopSrc(Graph, Graph)}.
      *  <p>

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.
  * <p>
  * 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}.
  * <p>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)}.
      * <p>Concrete operation.
      */

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
  * <p>See {@link StoragePrefixMap} for the storage implementation view.
  * <p>See {@link PrefixMapBase} for an implementation over {@link StoragePrefixMap}
  */

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() {
 	 * <li>otherwise create an ExprVar from {AbstractQuerybuilder.makeVar}
 	 * </ul>
 	 * 
-	 * @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) {
 	 * <li>otherwise calls var()</li>
 	 * </ul>
 	 * 
-	 * @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

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) {

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<Node> nodes) {
 	 * 
 	 * @param values
 	 *            the collection of values to add.
-	 * @return The builder for chaining.
 	 */
 	public void addValueRow(Collection<Node> values) {
 		if (values.size() != valuesTable.size()) {

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

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 <a href="https://www.w3.org/TR/sparql11-update/#example_1">sparql11-update example_1</a>
 	 */
 	@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 <a href="https://www.w3.org/TR/sparql11-update/#example_2">sparql11-update example_2</a>
 	 */
 	@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 <a href="https://www.w3.org/TR/sparql11-update/#example_3">sparql11-update example_3</a>
 	 */
 	@Test
 	public void example3() {
@@ -163,7 +163,7 @@ public void example3() {
 	/**
 	 * Example 4:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_4
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_4">sparql11-update example_4</a>
 	 */
 	@Test
 	public void example4() {
@@ -201,7 +201,7 @@ public void example4() {
 	/**
 	 * Example 5:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_5
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_5">sparql11-update example_5</a>
 	 */
 	@Test
 	public void example5() {
@@ -239,7 +239,7 @@ public void example5() {
 	/**
 	 * Example 6:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_6
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_6">sparql11-update example_6</a>
 	 */
 	@Test
 	public void example6() {
@@ -292,7 +292,7 @@ public void example6() {
 	/**
 	 * Example 7:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_7
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_7">sparql11-update example_7</a>
 	 */
 	@Test
 	public void example7() {
@@ -331,7 +331,7 @@ public void example7() {
 	/**
 	 * Example 8:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_8
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_8">sparql11-update example_8</a>
 	 */
 	@Test
 	public void example8() {
@@ -412,7 +412,7 @@ public void example8() {
 	/**
 	 * Example 9:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_9
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_9">sparql11-update example_9</a>
 	 */
 	@Test
 	public void example9() {
@@ -474,7 +474,7 @@ public void example9() {
 	/**
 	 * Example 10:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_10
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_10">sparql11-update example_10</a>
 	 */
 	@Test
 	public void example10() {
@@ -545,7 +545,7 @@ public void example10() {
 	/**
 	 * Example 11:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_11
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_11">sparql11-update example_11</a>
 	 */
 	@Test
 	public void example11() {
@@ -577,7 +577,7 @@ public void example11() {
 	/**
 	 * Example 12:
 	 * 
-	 * @see https://www.w3.org/TR/sparql11-update/#example_12
+     * @see <a href="https://www.w3.org/TR/sparql11-update/#example_12">sparql11-update example_12</a>
 	 */
 	@Test
 	public void example12() {

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();

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);  

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);

jena-text-es/pom.xml

@@ -146,6 +146,8 @@
           <httpPort>9400</httpPort>
           <timeout>${es.startup.timeout}</timeout>
           <version>${ver.elasticsearch}</version>
+          <!-- Console logger -->
+          <logLevel>WARN</logLevel>
         </configuration>
         <executions>
           <!--

pom.xml

@@ -875,7 +875,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.1.1</version>
           <executions>
             <execution>
               <id>attach-javadocs</id>
@@ -911,6 +911,24 @@
               <link>https://jena.apache.org/documentation/javadoc/permissions/</link>
               <link>https://jena.apache.org/documentation/javadoc/jdbc/</link>
             </links>
+            <!-- Settings for @apiNote, @implSpec and @implNote -->
+            <tags>
+              <tag>
+                <name>apiNote</name>
+                <placement>a</placement>
+                <head>API Note:</head>
+              </tag>
+              <tag>
+                <name>implSpec</name>
+                <placement>a</placement>
+                <head>Implementation Requirements:</head>
+              </tag>
+              <tag>
+                <name>implNote</name>
+                <placement>a</placement>
+                <head>Implementation Note:</head>
+              </tag>
+            </tags>
           </configuration>
         </plugin>