You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/05/10 15:19:54 UTC
[3/8] jena git commit: JENA-1546: Set surefire to 2.21.0. Clean-up
some javadoc
JENA-1546: Set surefire to 2.21.0. Clean-up some javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f754a311
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f754a311
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f754a311
Branch: refs/heads/master
Commit: f754a3112e15045a298578e6debcb171e9f0b424
Parents: 7e2879c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 9 22:29:10 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 9 22:29:10 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/json/JSON.java | 2 +-
.../org/apache/jena/atlas/json/JsonBuilder.java | 2 +-
.../main/java/org/apache/jena/query/ARQ.java | 10 ++++----
.../org/apache/jena/query/QuerySolutionMap.java | 2 +-
.../org/apache/jena/riot/RDFParserBuilder.java | 4 +--
.../java/org/apache/jena/riot/WebContent.java | 2 +-
.../jena/riot/lang/BlankNodeAllocatorHash.java | 2 +-
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 2 +-
.../java/org/apache/jena/sparql/SystemARQ.java | 4 +--
.../jena/sparql/algebra/optimize/Optimize.java | 4 +--
.../optimize/TransformPromoteTableEmpty.java | 18 +++++++-------
.../jena/sparql/core/TxnDataset2Graph.java | 4 +--
.../jena/sparql/engine/http/HttpQuery.java | 4 +--
.../java/org/apache/jena/sparql/expr/Expr.java | 4 +--
.../org/apache/jena/sparql/expr/ExprList.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 2 +-
.../jena/sparql/expr/nodevalue/XSDFuncOp.java | 16 ++++++------
.../jena/sparql/graph/NodeTransformLib.java | 12 ++++-----
.../apache/jena/sparql/lib/RDFTerm2Json.java | 2 +-
.../org/apache/jena/atlas/io/OutStreamUTF8.java | 2 +-
.../org/apache/jena/atlas/iterator/Iter.java | 4 +--
.../java/org/apache/jena/atlas/lib/Bytes.java | 4 +--
.../apache/jena/atlas/lib/RefCountingMap.java | 2 +-
.../apache/jena/atlas/lib/tuple/TupleMap.java | 26 ++++++++++----------
jena-cmds/src/main/java/jena/rdfcat.java | 2 +-
.../java/org/apache/jena/enhanced/EnhNode.java | 2 +-
.../java/org/apache/jena/ontology/OntTools.java | 2 +-
.../apache/jena/rdf/model/impl/RDFListImpl.java | 2 +-
.../apache/jena/rdf/model/impl/ReifierStd.java | 2 +-
.../org/apache/jena/rdf/model/impl/Util.java | 4 +--
.../org/apache/jena/shared/PrefixMapping.java | 4 +--
.../java/org/apache/jena/util/OneToManyMap.java | 2 +-
.../org/apache/jena/util/ResourceUtils.java | 2 +-
.../org/apache/jena/vocabulary/RDFTest.java | 2 +-
.../apache/jena/dboe/base/record/Record.java | 8 +++---
.../jena/dboe/transaction/TransInteger.java | 1 -
.../dboe/transaction/TransactionalInteger.java | 2 +-
.../org/apache/jena/tdb2/solver/SolverLib.java | 2 +-
.../apache/jena/tdb2/store/NodeIdInline.java | 2 +-
.../jena/tdb2/store/nodetable/NodeTable.java | 2 +-
.../jena/fuseki/build/RefCountingMap.java | 2 +-
.../org/apache/jena/fuseki/package-info.java | 2 +-
.../apache/jena/fuseki/server/RequestLog.java | 2 +-
jena-tdb/pom.xml | 1 -
.../org/apache/jena/tdb/base/record/Record.java | 8 +++---
.../jena/tdb/setup/StoreParamsDynamic.java | 4 +--
.../org/apache/jena/tdb/solver/SolverLib.java | 4 +--
pom.xml | 17 +++++--------
49 files changed, 106 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
index 2ddc912..8111a40 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
@@ -189,7 +189,7 @@ public class JSON
/** Build a JsonObject. The outer object is created and then the {@code setup} function called to fill in the contents.
* <pre>
- * buildObject(builder->{
+ * buildObject(builder->{
* builder.pair("key", 1234);
* });
* </pre>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
index 9347e98..85e6dab 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
@@ -92,7 +92,7 @@ public class JsonBuilder {
/** Build a JsonObject. The outer object is created and then the {@code setup} function called to fill in the contents.
* <pre>
- * buildObject(builder->{
+ * buildObject(builder->{
* builder.pair("key", 1234);
* });
* </pre>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index fa99256..099b0fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -236,9 +236,9 @@ public class ARQ
/**
* Use this Symbol to allow passing additional query parameters to a
- * SERVICE <IRI> call.
- * Parameters need to be grouped by SERVICE <IRI>,
- * a Map<String, Map<String,List<String>>> is assumed.
+ * {@literal SERVICE <IRI>} call.
+ * Parameters need to be grouped by {@literal SERVICE <IRI>},
+ * a {@literal Map<String, Map<String,List<String>>>} is assumed.
* The key of the first map is the SERVICE IRI, the value is a Map
* which maps the name of a query string parameters to its values.
*
@@ -317,7 +317,7 @@ public class ARQ
/**
* Context key controlling whether the main query engine flattens simple paths
- * (e.g. <tt>?x :p/:q ?z => ?x :p ?.0 . ?.0 ?q ?z</tt>)
+ * (e.g. <tt>?x :p/:q ?z => ?x :p ?.0 . ?.0 ?q ?z</tt>)
* <p>Default is "true"
*/
public static final Symbol optPathFlatten = SystemARQ.allocSymbol("optPathFlatten") ;
@@ -408,7 +408,7 @@ public class ARQ
/**
* Context key controlling whether the standard optimizer applies
- * optimizations to conjunctions (&&) in filters.
+ * optimizations to conjunctions (&&) in filters.
* <p>By default, this transformation is applied.
*/
public static final Symbol optFilterConjunction = SystemARQ.allocSymbol("optFilterConjunction") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java b/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
index e2d5098..da2884d 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/QuerySolutionMap.java
@@ -58,7 +58,7 @@ public class QuerySolutionMap extends QuerySolutionBase
* to the <code>QuerySolutionMap</code> and later changes to either <code>Map</code>
* or <code>QuerySolutionMap</code> will not reflected in the other.
*
- * @return Map<String, RDFNode>
+ * @return {@literal Map<String, RDFNode>}
*/
public Map<String, RDFNode> asMap() {
return new HashMap<>(map) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
index 6a596bf..8b59be5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java
@@ -321,8 +321,8 @@ public class RDFParserBuilder {
* </pre>
*
* The canonical forms follow XSD 1.1
- * <href="https://www.w3.org/TR/xmlschema11-2/#canonical-lexical-representation">2.3.1
- * Canonical Mapping</a> except in the case of xsd:decimal where it follows the older
+ * {@literal <href="https://www.w3.org/TR/xmlschema11-2/#canonical-lexical-representation">2.3.1
+ * Canonical Mapping</a>} except in the case of xsd:decimal where it follows the older
* XSD 1.0 which makes it legal for Turtle's short form ({@code "1.0"^^xsd:Decimal}
* rather than {@code "1"^^xsd:decimal}). See XSD 1.0 <a href=
* "https://www.w3.org/TR/xmlschema-2/#decimal-canonical-representation">3.2.3.2
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
index 1928e36..76f043e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
@@ -229,7 +229,7 @@ public class WebContent
* </p><p>
* The decision is
* <blockquote>
- * <i>Content type</i> (but not text/plain) > <i>hint</i> > <i>file extension</i>.
+ * <i>Content type</i> (but not text/plain) {@literal >} <i>hint</i> {@literal >} <i>file extension</i>.
* </blockquote>
* We make content type (via content negotiation) strongest because a server
* may return something unexpected because that is all it can do. We are
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
index 32e02bf..69bad35 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
@@ -39,7 +39,7 @@ import org.apache.jena.graph.NodeFactory;
* fed to a digest to give a bit string, (currently MD5, to get a 128bit bit
* string) that is used to form a bNode AnonId of hex digits.
* <p>
- * In addition there is a cache of label->node allocations, using the natural
+ * In addition, there is a cache of label{@literal ->}node allocations, using the natural
* tendency to locality in a database dump. (subject bNodes, bNodes in lists
* and other data values structures like unit values).
* <p>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index fd35aa9..5d4993a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -125,7 +125,7 @@ public abstract class IRIResolver
/** The IRI checker setup, focused on parsing and languages.
* This is a clean version of jena-iri {@link IRIFactory#iriImplementation()}
- * modified to allow unregistered schemes and allow <file:relative> IRIs.
+ * modified to allow unregistered schemes and allow {@code <file:relative>} IRIs.
*
* @see IRIFactory
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index dc46ccf..eb51b9c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -60,7 +60,7 @@ public class RiotLib
private final static String bNodeLabelStart = "_:";
private final static boolean skolomizedBNodes = ARQ.isTrue(ARQ.constantBNodeLabels);
- /** Implement <_:....> as a "Node IRI"
+ /** Implement {@code <_:....>} as a "Node IRI"
* that is, use the given label as the BNode internal label.
* Use with care.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java b/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
index b607a20..27a96aa 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java
@@ -50,11 +50,11 @@ public class SystemARQ
public static boolean ValueExtensions = true ;
/**
- * Under strict F&O, dateTimes and dates with no timezone have one magically applied.
+ * Under strict {@literal F&O}, dateTimes and dates with no timezone have one magically applied.
* This default timezone is implementation dependent and can lead to different answers
* to queries depending on the timezone. Normally, ARQ uses XMLSchema dateTime comparions,
* which an yield "indeterminate", which in turn is an evaluation error.
- * F&O insists on true/false and so can lead to false positves and negatives.
+ * {@literal F&O} insists on true/false and so can lead to false positves and negatives.
*/
public static boolean StrictDateTimeFO = false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
index dd3524e..a5c4f76 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/Optimize.java
@@ -29,10 +29,10 @@ import org.apache.jena.sparql.util.Context ;
* <p>
* New optimization processes can be installed via a global change:
* <pre>
- * Optimize.setFactory((cxt)->new MyOptimizer(cxt)) ;</pre>
+ * Optimize.setFactory((cxt)->new MyOptimizer(cxt)) ;</pre>
* or on a per-context basis:
* <pre>
- * Optimize.RewriterFactory f = (cxt)->new MyOptimizer(cxt) ;
+ * Optimize.RewriterFactory f = (cxt)->new MyOptimizer(cxt) ;
* context.set(ARQConstants.sysOptimizerFactory, f) ;<pre>
*/
public class Optimize
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
index 54d260e..1593d4f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformPromoteTableEmpty.java
@@ -51,25 +51,25 @@ import org.apache.jena.sparql.algebra.op.* ;
* The optimizer makes the following promotions:
* </p>
* <ul>
- * <li>Graph over table empty => table empty</li>
- * <li>Assign/Extend over table empty => table empty</li>
- * <li>Join where either side is table empty => table empty</li>
+ * <li>Graph over table empty {@literal =>} table empty</li>
+ * <li>Assign/Extend over table empty {@literal =>} table empty</li>
+ * <li>Join where either side is table empty {@literal =>} table empty</li>
* <li>Left Join:
* <ul>
- * <li>If LHS is table empty => table empty</li>
- * <li>If RHS is table empty => LHS</li>
+ * <li>If LHS is table empty {@literal =>} table empty</li>
+ * <li>If RHS is table empty {@literal =>} LHS</li>
* </ul>
* </li>
* <li>Union:
* <ul>
- * <li>If both sides are table empty => table empty</li>
- * <li>If one side is table empty => other side</li>
+ * <li>If both sides are table empty {@literal =>} table empty</li>
+ * <li>If one side is table empty {@literal =>} other side</li>
* </ul>
* </li>
* <li>Minus:
* <ul>
- * <li>If LHS is table empty => table empty</li>
- * <li>If RHS is table empty => LHS</li>
+ * <li>If LHS is table empty {@literal =>} table empty</li>
+ * <li>If RHS is table empty {@literal =>} LHS</li>
* </ul>
* </li>
* </ul>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
index 4d84b70..182ec15 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/TxnDataset2Graph.java
@@ -51,8 +51,8 @@ import org.apache.jena.sparql.JenaTransactionException;
* Best practice is to change the graph membership outside of any transaction,
* ideally at setup time of the object using this class. (Caution: SPARQL Update
* can create graphs.)
- * @See {@link DatasetGraphMapLink}
- * @See {@link DatasetGraphOne}
+ * @see DatasetGraphMapLink
+ * @see DatasetGraphOne
*/
public class TxnDataset2Graph extends TransactionalLock {
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
index 524374e..ca6c038 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
@@ -232,7 +232,7 @@ public class HttpQuery extends Params {
}
/**
- * Sets HTTP Connection timeout, any value <= 0 is taken to mean no timeout
+ * Sets HTTP Connection timeout, any value {@literal <=} 0 is taken to mean no timeout
*
* @param timeout
* Connection Timeout
@@ -251,7 +251,7 @@ public class HttpQuery extends Params {
}
/**
- * Sets HTTP Read timeout, any value <= 0 is taken to mean no timeout
+ * Sets HTTP Read timeout, any value {@literal <=} 0 is taken to mean no timeout
*
* @param timeout
* Read Timeout
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
index 2646d38..5454275 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/Expr.java
@@ -72,7 +72,7 @@ public interface Expr
public Expr copySubstitute(Binding binding) ;
/**
- * Rewrite, applying a node->node transformation
+ * Rewrite, applying a node{@literal ->}node transformation
*/
public Expr applyNodeTransform(NodeTransform transform) ;
@@ -121,7 +121,7 @@ public interface Expr
* must be different syntax, <code>equalsBySyntax</code> implies <code>equals</code>
* (by alegbra).
* <p>
- * Hence, different <code>hashCode</code> => not <code>equalsBySyntax<code>.
+ * Hence, different <code>hashCode</code> {@literal =>} not <code>equalsBySyntax<code>.
*/
@Override
public int hashCode() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
index 9e60e2c..899b3d6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
@@ -85,7 +85,7 @@ public class ExprList implements Iterable<Expr>
}
/**
- * Rewrite, applying a node->node transformation
+ * Rewrite, applying a node{@literal ->}node transformation
*/
public ExprList applyNodeTransform(NodeTransform transform) {
ExprList x = new ExprList() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 23b5c79..718a973 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -582,7 +582,7 @@ public abstract class NodeValue extends ExprNode
}
/** Compare by value (and only value) if possible.
- * Supports <, <=, >, >= but not = nor != (which are sameValueAs and notSameValueAs)
+ * Supports <, <=, >, >= but not = nor != (which are sameValueAs and notSameValueAs)
* @param nv1
* @param nv2
* @return negative, 0 , or positive for not possible, less than, equal, greater than.
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
index e7ac670..80dfa7b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java
@@ -203,20 +203,20 @@ public class XSDFuncOp
return nv1 ;
}
- /** F&O fn:not */
+ /** {@literal F&O} fn:not */
public static NodeValue not(NodeValue nv) {
boolean b = XSDFuncOp.booleanEffectiveValue(nv) ;
return NodeValue.booleanReturn(!b) ;
}
- /** F&O fn:boolean */
+ /** {@literal F&O} fn:boolean */
public static NodeValue booleanEffectiveValueAsNodeValue(NodeValue nv) {
if ( nv.isBoolean() ) // "Optimization" (saves on object churn)
return nv ;
return NodeValue.booleanReturn(booleanEffectiveValue(nv)) ;
}
- /** F&O fn:boolean */
+ /** {@literal F&O} fn:boolean */
public static boolean booleanEffectiveValue(NodeValue nv) {
// Apply the "boolean effective value" rules
// boolean: value of the boolean (strictly, if derived from xsd:boolean)
@@ -686,7 +686,7 @@ public class XSDFuncOp
return NodeValue.makeString(encStr) ;
}
- /** F&O fn:concat (implicit cast to strings). */
+ /** {@literal F&O} fn:concat (implicit cast to strings). */
public static NodeValue fnConcat(List<NodeValue> args) {
StringBuilder sb = new StringBuilder() ;
@@ -990,7 +990,7 @@ public class XSDFuncOp
public static final String defaultTimezone = "Z" ;
- /** Strict F&O handling of compare date(times).
+ /** Strict {@literal F&O} handling of compare date(times).
* But that means applying the "local" timezone if there is no TZ.
* The data may have come from different timezones to the query.
*/
@@ -1160,7 +1160,7 @@ public class XSDFuncOp
return nv.hasDateTime() ;
}
- /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+ /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
* <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
* Throws an exception on incorrect case.
*
@@ -1172,7 +1172,7 @@ public class XSDFuncOp
return dateTimeCast(nv, t) ;
}
- /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+ /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
* <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
* Throws an exception on incorrect case.
*
@@ -1199,7 +1199,7 @@ public class XSDFuncOp
return tzStr ;
}
- /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to F&O
+ /** Cast a NodeValue to a date/time type (xsd dateTime, date, time, g*) according to {@literal F&O}
* <a href="http://www.w3.org/TR/xpath-functions/#casting-to-datetimes">17.1.5 Casting to date and time types</a>
* Throws an exception on incorrect case.
*
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
index e4d4f3a..ac5af98 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeTransformLib.java
@@ -41,14 +41,14 @@ import org.apache.jena.sparql.expr.ExprTransform;
public class NodeTransformLib
{
- /** Do a node->node conversion of an Op - return original BGP for "no change" */
+ /** Do a node{@literal ->}node conversion of an Op - return original BGP for "no change" */
public static Op transform(NodeTransform nodeTransform, Op op) {
Transform opTransform = new NodeTransformOp(nodeTransform) ;
ExprTransform exprTransform = new NodeTransformExpr(nodeTransform) ;
return Transformer.transform(opTransform, exprTransform, op);
}
- /** Do a node->node conversion of a BGP - return original BGP for "no change" */
+ /** Do a node{@literal ->}node conversion of a BGP - return original BGP for "no change" */
public static BasicPattern transform(NodeTransform nodeTransform, BasicPattern pattern) {
BasicPattern bgp2 = new BasicPattern() ;
boolean changed = false ;
@@ -64,7 +64,7 @@ public class NodeTransformLib
return bgp2 ;
}
- /** Do a node->node conversion of a QuadPattern - return original QuadPattern for "no change" */
+ /** Do a node{@literal ->}node conversion of a QuadPattern - return original QuadPattern for "no change" */
public static QuadPattern transform(NodeTransform nodeTransform, QuadPattern pattern) {
QuadPattern qp2 = new QuadPattern() ;
boolean changed = false ;
@@ -80,7 +80,7 @@ public class NodeTransformLib
return qp2 ;
}
- /** Do a node->node conversion of a Triple - return original Triple for "no change" */
+ /** Do a node{@literal ->}node conversion of a Triple - return original Triple for "no change" */
public static Triple transform(NodeTransform nodeTransform, Triple triple) {
boolean change = false ;
Node s = triple.getSubject() ;
@@ -99,7 +99,7 @@ public class NodeTransformLib
return new Triple(s,p,o) ;
}
- /** Do a node->node conversion of a Quad - return original Quad for "no change" */
+ /** Do a node{@literal ->}node conversion of a Quad - return original Quad for "no change" */
public static Quad transform(NodeTransform nodeTransform, Quad quad) {
boolean change = false ;
Node s = quad.getSubject() ;
@@ -146,7 +146,7 @@ public class NodeTransformLib
- /** Do a node->node conversion of a List<Quad> - return original List<Quad> for "no change" */
+ /** Do a node{@literal ->}node conversion of a List<Quad> - return original List<Quad> for "no change" */
public static List<Quad> transformQuads(NodeTransform nodeTransform, List<Quad> quads) {
List<Quad> x = new ArrayList<>() ;
boolean changed = false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java b/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
index bcf1fd1..020211d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lib/RDFTerm2Json.java
@@ -31,7 +31,7 @@ import org.apache.jena.sparql.function.js.NV;
* <p>
* This is a one way, lossy, conversion from an RDF Term to the best available JSON value.
* <p>
- * This is not SPARQL results in JSON ({@locde application/result-sets+json}).
+ * This is not SPARQL results in JSON ({@code application/result-sets+json}).
*
* <table>
* <tr><th>RDF Term</th><th>JSON value</th></tr>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
index d4d15d4..36c078f 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
@@ -23,7 +23,7 @@ import java.io.OutputStream ;
import java.io.Writer ;
/** Output UTF-8 encoded data.
- * This class implements the "Modified UTF8" encoding rules (null -> C0 80)
+ * This class implements the "Modified UTF8" encoding rules (null {@literal ->} C0 80)
* It will encode any 16 bit value.
* It can be used as a pure UTf-8 encoder.
*
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
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 cb9871b..5e615ed 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
@@ -39,7 +39,7 @@ import org.apache.jena.atlas.lib.Sink ;
* <pre>
* import static org.apache.jena.atlas.iterator.Iter.* ;
*
- * filter(map(iterator, <i>function></i>), <i>predicate</i>)
+ * filter(map(iterator, function), predicate)
* </pre>
*
* Style 2: Stream-like: The class {@code Iter} provides methods to call on an iterator.
@@ -47,7 +47,7 @@ import org.apache.jena.atlas.lib.Sink ;
* <pre>
* import static org.apache.jena.atlas.iterator.Iter.iter ;
*
- * iter(iterator).map(...).filter(...)}
+ * iter(iterator).map(...).filter(...)
* </pre>
*
* @param <T> the type of element over which an instance of {@code Iter} iterates,
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
index 71f78d6..bf2c32e 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Bytes.java
@@ -26,8 +26,8 @@ import java.nio.charset.CharsetEncoder ;
import java.nio.charset.CoderResult ;
/** Byte-oriented operations. Packing and unpacking integers
- * is in network order (Big endian - which is the preferred order in Java)
- * {@link "http://en.wikipedia.org/wiki/Endianness"}
+ * is in network order (Big endian - which is the preferred order in Java).
+ * See <a href="http://en.wikipedia.org/wiki/Endianness">wikipedia Endianness</a>.
*/
public class Bytes
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
index 4cfe37d..a4adaf4 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java
@@ -24,7 +24,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
/**
- * A key -> value 'map' which reference counts entries.
+ * A key {@literal ->} value 'map' which reference counts entries.
*
* <p>
* The same (key,value) pair can be added to the map several times and then
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
index 59a0a8a..6012ac8 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/tuple/TupleMap.java
@@ -43,9 +43,9 @@ import org.apache.jena.atlas.lib.StrUtils ;
*
* A {@code TupleMap} holds twp maps: the "getTransform" and the "putTransform".
* The "getTransform" is here to get the item from in the mapper Tuple.
- * In the case is {@code SPO->POS} this is
- * {@code 0<-1, 1<-2, 2<-0}
- * and the "putTransform" is where to place the items: {@code 0->2, 1->0, 2->1}.
+ * In the case is {@code SPO{@literal ->}POS} this is
+ * {@code 0{@literal <-}1, 1{@literal <-}2, 2{@literal <-}0}
+ * and the "putTransform" is where to place the items: {@code 0{@literal ->}2, 1{@literal ->}0, 2{@literal ->}1}.
*/
final
public class TupleMap {
@@ -114,8 +114,8 @@ public class TupleMap {
/**
* Construct a mapping - the elements are the mappings of a tuple
- * originally in the order 0,1,2,... so SPO->POS is 2,0,1 (SPO->POS so S->2,
- * P->0, O->1) and not 1,2,0 (which is the extraction mapping). The label is
+ * originally in the order 0,1,2,... so SPO{@literal ->}POS is 2,0,1 (SPO{@literal ->}POS so S{@literal ->}2,
+ * P{@literal ->}0, O{@literal ->}1) and not 1,2,0 (which is the extraction mapping). The label is
* just a label and is not interpreted here.
*/
private TupleMap(String label, int... elements) {
@@ -165,7 +165,7 @@ public class TupleMap {
/**
* Get the index of the i'th slot as it appears from a mapping : for
- * SPO->POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
+ * SPO{@literal ->}POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
* The 0'th mapped slot is {@code tuple.get(tupleMap.getSlotIdx(0))}.
*/
public int getSlotIdx(int idx) {
@@ -173,7 +173,7 @@ public class TupleMap {
}
/**
- * Get the index of the i'th slot as it appears after unmapping : SPO->POS :
+ * Get the index of the i'th slot as it appears after unmapping : SPO{@literal ->}POS :
* 0'th slot is S from POS so 0 returns 2
*/
public int putSlotIdx(int idx) {
@@ -182,7 +182,7 @@ public class TupleMap {
/**
* Get the index of the i'th slot as it appears from a mapping : for
- * SPO->POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
+ * SPO{@literal ->}POS : 0'th slot is P so 0 returns 1 (the location in the tuple before mapping)
* Equivalent to {@link #getSlotIdx}.<br/>
* The 0'th mapped slot is {@code tuple.get(tupleMap.mapIdx(0))}.<br/>
* Mapping a tuple is {@code map(tuple) == create(tuple.mapIdx(0) , tuple.mapIdx(1), ... tuple.mapIdx(n-1))}<br/>
@@ -192,7 +192,7 @@ public class TupleMap {
}
/**
- * Get the index of the i'th slot as it appears after unmapping : SPO->POS :
+ * Get the index of the i'th slot as it appears after unmapping : SPO{@literal ->}POS :
* 0'th slot is S from POS so 0 returns 2
* Equivalent to {@link #putSlotIdx}.<br/>
* The 0'th unmapped slot is {@code tuple.get(tupleMap.unmapIdx(0))}.<br/>
@@ -282,7 +282,7 @@ public class TupleMap {
/**
* Apply to an <em>unmapped</em> tuple to get the i'th slot after mapping :
- * SPO->POS : 0'th slot is P from SPO
+ * SPO{@literal ->}POS : 0'th slot is P from SPO
*/
public <T> T mapSlot(int idx, Tuple<T> tuple) {
checkLength(tuple) ;
@@ -292,7 +292,7 @@ public class TupleMap {
/**
* Apply to a <em>mapped</em> tuple to get the i'th slot as it appears after
- * mapping : SPO->POS : 0'th slot is S from POS
+ * mapping : SPO{@literal ->}POS : 0'th slot is S from POS
*/
public <T> T unmapSlot(int idx, Tuple<T> tuple) {
checkLength(tuple) ;
@@ -302,7 +302,7 @@ public class TupleMap {
/**
* Apply to an <em>unmapped</em> tuple to get the i'th slot after mapping :
- * SPO->POS : 0'th slot is P from SPO
+ * SPO{@literal ->}POS : 0'th slot is P from SPO
*/
public <T> T mapSlot(int idx, T[] tuple) {
return tuple[getSlotIdx(idx)] ;
@@ -310,7 +310,7 @@ public class TupleMap {
/**
* Apply to a <em>mapped</em> tuple to get the i'th slot as it appears after
- * mapping : SPO->POS : 0'th slot is S from POS
+ * mapping : SPO{@literal ->}POS : 0'th slot is S from POS
*/
public <T> T unmapSlot(int idx, T[] tuple) {
return tuple[putSlotIdx(idx)] ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-cmds/src/main/java/jena/rdfcat.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/jena/rdfcat.java b/jena-cmds/src/main/java/jena/rdfcat.java
index efe16dc..cb3ad6d 100644
--- a/jena-cmds/src/main/java/jena/rdfcat.java
+++ b/jena-cmds/src/main/java/jena/rdfcat.java
@@ -108,7 +108,7 @@ import org.apache.jena.vocabulary.RDFS ;
* java jena.rdfcat in1 -out N3 > out.n3
*
* Join two owl files one N3, one XML, and their imports, into a single NTRIPLE file:
- * java jena.rdfcat -out NTRIPLE -include in1.owl -n in2.owl > out.ntriple
+ * java jena.rdfcat -out NTRIPLE -include in1.owl -n in2.owl > out.ntriple
*
* Concatenate two N3-serving http URL's as N-TRIPLE
* java jena.rdfcat -in N3 -out N-TRIPLE http://example.com/a http://example.com/b
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
index a975f6d..7b851f8 100644
--- a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
+++ b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
@@ -102,7 +102,7 @@ public class EnhNode extends Polymorphic<RDFNode> implements FrontsNode
return asInternal( t );
}
- /** allow subclasses to implement RDFNode & its subinterface */
+ /** allow subclasses to implement RDFNode & its subinterface */
public <T extends RDFNode> T as( Class<T> t )
{ return asInternal( t ); }
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index 1f80448..f398059 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -138,7 +138,7 @@ public class OntTools
* and the object of the last statement in the list is <code>end</code>.</p>
* <p>The <code>onPath</code> argument is a {@link Predicate}, which accepts a statement and returns
* true if the statement should be considered to be on the path. To search for an unconstrained
- * path, pass <code>()->true</code> as an argument. To search for a path whose predicates match a
+ * path, pass {@code ()->true} as an argument. To search for a path whose predicates match a
* fixed restricted set of property names, pass an instance of {@link PredicatesFilter}.</p>
* <p>If there is more than one path of minimal length from <code>start</code> to <code>end</code>,
* this method returns an arbitrary one. The algorithm is blind breadth-first search,
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
index d9f5e6d..2eb8b82 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
@@ -313,7 +313,7 @@ public class RDFListImpl
* Add the given value to the end of the list. This is a side-effecting
* operation on the underlying model that is only defined if this is not the
* empty list. If this list is the empty (nil) list, we cannot perform a
- * side-effecting update without changing the URI of this node (from <code>rdf:nil</code)
+ * side-effecting update without changing the URI of this node (from <code>rdf:nil</code>)
* to a blank-node for the new list cell) without violating a Jena invariant.
* Therefore, this update operation will throw an exception if an attempt is
* made to add to the nil list. Safe ways to add to an empty list include
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
index 4b5fe76..88442ff 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
@@ -115,7 +115,7 @@ public class ReifierStd
}
/**
- @return true iff there's > 0 mappings to this triple
+ @return true iff there's {@literal >} 0 mappings to this triple
*/
public static boolean hasTriple(Graph graph, Triple t)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
index 64dc047..680b7e1 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
@@ -228,8 +228,8 @@ public class Util extends Object {
}
/** Return true if the literal is a simple string.
- * <p>RDF 1.0 => it is a plain literal, with no language tag
- * <p>RDF 1.1 => it has datatype xsd:string
+ * <p>RDF 1.0 {@literal =>} it is a plain literal, with no language tag
+ * <p>RDF 1.1 {@literal =>} it has datatype xsd:string
*/
public static boolean isSimpleString(Literal lit) {
Objects.requireNonNull(lit) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java b/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
index 133db07..0e0da64 100644
--- a/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
+++ b/jena-core/src/main/java/org/apache/jena/shared/PrefixMapping.java
@@ -131,7 +131,7 @@ public interface PrefixMapping
Return a copy of the internal mapping from names to URI strings. Updating
this copy will have no effect on the PrefixMap.
- @return a copy of the internal String -> String mapping
+ @return a copy of the internal String {@literal ->} String mapping
*/
Map<String, String> getNsPrefixMap();
@@ -147,7 +147,7 @@ public interface PrefixMapping
/**
Compress the URI using the prefix mappings if possible. If there is a
- prefix mapping Name -> URIStart, and uri is URIStart+Tail, return Name:Tail;
+ prefix mapping Name {@literal ->} URIStart, and uri is URIStart+Tail, return Name:Tail;
otherwise return uri unchanged. If there are multiple applicable mappings
available, the "most recent" is chosen if that is possible, otherwise
one is picked "at random".
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java b/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
index fac1044..a19268a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
+++ b/jena-core/src/main/java/org/apache/jena/util/OneToManyMap.java
@@ -457,7 +457,7 @@ public class OneToManyMap<From, To> implements Map<From, To>
* More formally, two entries e1 and e2 represent the same mapping if
* <code><pre>
* (e1.getKey()==null ?
- * e2.getKey()==null : e1.getKey().equals(e2.getKey())) &&
+ * e2.getKey()==null : e1.getKey().equals(e2.getKey())) &&
* (e1.getValue()==null ?
* e2.getValue()==null : e1.getValue().equals(e2.getValue()))
* </pre></code>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java b/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
index 6308b94..9ac555a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
+++ b/jena-core/src/main/java/org/apache/jena/util/ResourceUtils.java
@@ -146,7 +146,7 @@ public class ResourceUtils {
* input list of resources. The equivalence relation is the predicate p.
* So, two resources <code>a</code> and <code>b</code>
* will be in the same partition iff
- * <code>(a p b) && (b p a)</code>.</p>
+ * {@code (a p b) && (b p a)}.</p>
* @param <T>
* @param l A list of resources
* @param p An equivalence predicate
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
index 94c542e..d05eaae 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFTest.java
@@ -87,7 +87,7 @@ public class RDFTest {
public static final Property document = m_model.createProperty( "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#document" );
/** <p>This manifest entry is used to describe test cases that do not fall into one
- * of the categories. It may have several associated files, indicated in <test:document>
+ * of the categories. It may have several associated files, indicated in {@literal <test:document>}
* elements.</p>
*/
public static final Resource MiscellaneousTest = m_model.createResource( "http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#MiscellaneousTest" );
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
index 8459aaa..a6bab1b 100644
--- a/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
+++ b/jena-db/jena-dboe-base/src/main/java/org/apache/jena/dboe/base/record/Record.java
@@ -91,28 +91,28 @@ public class Record //implements Comparable<Record>
return x != 0 ;
}
- /** Is the key of record1 < key of record2 */
+ /** Is the key of record1 {@literal <} key of record2 */
public static boolean keyLT(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x < 0 ;
}
- /** Is the key of record1 <= key of record2 */
+ /** Is the key of record1 {@literal <=} key of record2 */
public static boolean keyLE(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x <= 0 ;
}
- /** Is the key of record1 >= key of record2 */
+ /** Is the key of record1 {@literal >=} key of record2 */
public static boolean keyGE(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x >= 0 ;
}
- /** Is the key of record1 > key of record2 */
+ /** Is the key of record1 {@literal >} key of record2 */
public static boolean keyGT(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
index 3a44301..a84a2b6 100644
--- a/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
+++ b/jena-db/jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/TransInteger.java
@@ -33,7 +33,6 @@ import org.apache.jena.dboe.transaction.txn.TxnId;
import org.apache.jena.query.ReadWrite ;
/** A transaction component with an integer supporting MR+SW (=one writer AND many readers).
- * @see TransactionalInteger
*/
public class TransInteger extends TransactionalComponentLifecycle<TransInteger.IntegerState> {
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
index d3f1e04..1170ff3 100644
--- a/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
+++ b/jena-db/jena-dboe-transaction/src/test/java/org/apache/jena/dboe/transaction/TransactionalInteger.java
@@ -25,7 +25,7 @@ import org.apache.jena.dboe.transaction.txn.TransactionalBase;
/**
* A Transactional (unit of begin/commit) of a single integer component.
* Testing support. Use {@link TransInteger} for application code.
- * @see TransInteger
+ * @see TransInteger
*/
public class TransactionalInteger extends TransactionalBase {
final private TransInteger integer ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
index 160c8be..86e25fa 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLib.java
@@ -232,7 +232,7 @@ public class SolverLib
return binding -> SolverLib.convert(binding, nodeTable);
}
- /** Binding ==> BindingNodeId, given a NodeTable */
+ /** Binding {@literal ->} BindingNodeId, given a NodeTable */
public static BindingNodeId convert(Binding binding, NodeTable nodeTable)
{
if ( binding instanceof BindingTDB )
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
index 436b9c1..dfee9d4 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdInline.java
@@ -137,7 +137,7 @@ public class NodeIdInline {
/** Return true if this node has a datatype that look like it is inlineable.
* The node may still be out of range (e.g. very large integer).
- * Only inline(Node)->NodeId can determine that.
+ * Only inline(Node){@literal ->}NodeId can determine that.
*/
public static boolean hasInlineDatatype(Node node) {
if ( ! node.isLiteral() )
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
index a7d217c..e6b5612 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTable.java
@@ -27,7 +27,7 @@ import org.apache.jena.atlas.lib.Sync ;
import org.apache.jena.graph.Node ;
import org.apache.jena.tdb2.store.NodeId;
-/** Node table - conceptually a two way mapping of Node<->NodeId
+/** Node table - conceptually a two way mapping of Node{@literal <->}NodeId
* where Nodes can be stored and a NodeId allocated
* @see NodeId
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
index cfb0ebe..b960905 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java
@@ -24,7 +24,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
/**
- * A key -> value 'map' which reference counts entries.
+ * A key {@literal ->} value 'map' which reference counts entries.
*
* <p>
* The same (key,value) pair can be added to the map several times and then
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
index 34d6339..d058671 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/package-info.java
@@ -35,7 +35,7 @@
* <li><em>ServiceRouterServlet</em> :: Routes requests to the appropriate service (i.e. implementing servlet).</li>
* <li><em>ActionBase</em> :: Creates a basic {@code HttpAction} and defines {@code execCommonWorker}.</li>
* <li><em>ActionService</em> :: Fills in {@code HttpAction} with dataset and endpoint. Calls {@code setRequest} on an {@code HttpAction}.
- * It implements {@code execCommonWorker} as a lifecycle => {@code executeAction} => {@code executeLifecycle} => {@code validate - perform}
+ * It implements {@code execCommonWorker} as a lifecycle => {@code executeAction} => {@code executeLifecycle} => {@code validate - perform}
* <li><em>ServiceRouter</em> :: Routing of request to the cocrete servlet implementations.
* </ul>
* <p>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
index 60f5082..a5fc722 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
@@ -61,7 +61,7 @@ NCSA extended/combined log format
}
/** NCSA combined log format *
- * LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedfwd
+ * LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedfwd
* XXX.XXX.XXX.XXX - - [01/Feb/2014:03:19:09 +0000] "GET / HTTP/1.1" 200 6190 "-" "check_http/v1.4.16 (nagios-plugins 1.4.16)"
*/
public static String combinedNCSA(HttpAction action) {
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index f61d75c..d351b17 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -152,7 +152,6 @@
<configuration>
<version>true</version>
<show>public</show>
- <quiet>true</quiet>
<encoding>UTF-8</encoding>
<windowtitle>Apache Jena TDB</windowtitle>
<doctitle>Apache Jena TDB ${project.version}</doctitle>
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
index 82a9950..a5cbf37 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/record/Record.java
@@ -117,28 +117,28 @@ public class Record //implements Comparable<Record>
return x != 0 ;
}
- /** Is the key of record1 < key of record2 */
+ /** Is the key of record1 {@literal <} key of record2 */
public static boolean keyLT(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x < 0 ;
}
- /** Is the key of record1 <= key of record2 */
+ /** Is the key of record1 {@literal <=} key of record2 */
public static boolean keyLE(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x <= 0 ;
}
- /** Is the key of record1 >= key of record2 */
+ /** Is the key of record1 {@literal >=} key of record2 */
public static boolean keyGE(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
return x >= 0 ;
}
- /** Is the key of record1 > key of record2 */
+ /** Is the key of record1 {@literal >} key of record2 */
public static boolean keyGT(Record record1, Record record2)
{
int x = compareByKey(record1, record2) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
index 9023d49..67408ba 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsDynamic.java
@@ -39,11 +39,11 @@ public interface StoreParamsDynamic {
public Integer getBlockWriteCacheSize() ;
public boolean isSetBlockWriteCacheSize() ;
- /** Node cache for Node->NodeId. */
+ /** Node cache for Node{@literal ->}NodeId. */
public Integer getNode2NodeIdCacheSize() ;
public boolean isSetNode2NodeIdCacheSize() ;
- /** Node cache for NodeId->Node. Important for SPARQL results. */
+ /** Node cache for NodeId{@literal ->}Node. Important for SPARQL results. */
public Integer getNodeId2NodeCacheSize() ;
public boolean isSetNodeId2NodeCacheSize() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
index 912f1e9..ff54d73 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/SolverLib.java
@@ -103,7 +103,7 @@ public class SolverLib
List<Triple> triples = pattern.getList() ;
boolean anyGraph = (graphNode==null ? false : (Node.ANY.equals(graphNode))) ;
-
+
int tupleLen = nodeTupleTable.getTupleTable().getTupleLen() ;
if ( graphNode == null ) {
if ( 3 != tupleLen )
@@ -235,7 +235,7 @@ public class SolverLib
return binding -> SolverLib.convert(binding, nodeTable);
}
- /** Binding ==> BindingNodeId, given a NodeTable */
+ /** Binding {@literal ->} BindingNodeId, given a NodeTable */
public static BindingNodeId convert(Binding binding, NodeTable nodeTable)
{
if ( binding instanceof BindingTDB )
http://git-wip-us.apache.org/repos/asf/jena/blob/f754a311/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 750ddb8..443268e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,7 +262,7 @@
<!-- Slow building modules -->
<module>jena-jdbc</module>
<!-- Fails when building with Java9 JDK because it requires
- system jar jdk.tools which is not available in Java9.
+ system jar jdk.tools which is not available in Java9 onwards
-->
<module>jena-elephas</module>
<module>apache-jena-osgi</module>
@@ -744,7 +744,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>2.21.0</version>
</plugin>
<plugin>
@@ -780,20 +780,16 @@
</execution>
</executions>
<configuration>
-
- <!-- Java8 and later -->
- <!-- javadoc-plug v2.x way to do this
- <additionalparam>-Xdoclint:none</additionalparam>
+ <!-- Java 10
+ <additionalOptions>-html5</additionalOptions>
-->
- <!-- The javadoc-plugin v3 way to do this -->
+
<doclint>none</doclint>
-
<!-- To allow the build to keep going despite javadoc problems:
<failOnError>false</failOnError>
-->
<version>true</version>
<show>public</show>
- <quiet>true</quiet>
<encoding>UTF-8</encoding>
<windowtitle>${project.name} ${project.version}</windowtitle>
<doctitle>${project.name} ${project.version}</doctitle>
@@ -803,11 +799,10 @@
<link>http://jena.apache.org/documentation/javadoc/arq/</link>
<link>http://jena.apache.org/documentation/javadoc/tdb/</link>
<link>http://jena.apache.org/documentation/javadoc/text/</link>
- <link>http://jena.apache.org/documentation/javadoc/spatial/</link>
+ <link>http://jena.apache.org/documentation/javadoc/rdfconnection/</link>
<link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
<link>http://jena.apache.org/documentation/javadoc/permissions/</link>
<link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
- <link>http://jena.apache.org/documentation/javadoc/elephas/</link>
</links>
</configuration>
</plugin>