jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [05/21] jena git commit: Emendations in response to comments from @afs
Date Sat, 09 May 2015 10:48:44 GMT
Emendations in response to comments from @afs


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6711901a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6711901a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6711901a

Branch: refs/heads/jena926-remove-graphstore
Commit: 6711901ab0a0d23dfb99794c8daf5dbf6d0a7e37
Parents: a664cb6
Author: ajs6f <ajs6f@virginia.edu>
Authored: Tue May 5 11:30:54 2015 -0400
Committer: ajs6f <ajs6f@virginia.edu>
Committed: Tue May 5 11:30:54 2015 -0400

----------------------------------------------------------------------
 .../org/apache/jena/atlas/json/JsonBuilder.java |  4 +--
 .../org/apache/jena/atlas/web/MediaType.java    |  4 +--
 .../org/apache/jena/query/SortCondition.java    |  5 ++--
 .../java/org/apache/jena/riot/RDFFormat.java    |  7 +++--
 .../org/apache/jena/riot/RDFFormatVariant.java  |  5 ++--
 .../org/apache/jena/riot/RDFWriterRegistry.java | 29 ++++++++++----------
 .../jena/riot/adapters/RDFReaderRIOT_Web.java   |  4 +--
 .../org/apache/jena/riot/lang/JsonLDReader.java |  4 +--
 .../jena/riot/other/BatchedStreamRDF.java       |  6 ++--
 .../jena/riot/out/SinkQuadBracedOutput.java     |  4 +--
 .../java/org/apache/jena/riot/tokens/Token.java | 10 +++----
 .../apache/jena/riot/writer/TurtleShell.java    |  5 ++--
 .../riot/writer/WriterStreamRDFBatched.java     |  6 ++--
 .../jena/riot/writer/WriterStreamRDFBlocks.java |  8 ++----
 .../apache/jena/sparql/algebra/op/OpAssign.java |  5 ++--
 .../apache/jena/sparql/algebra/op/OpExtend.java |  5 ++--
 .../apache/jena/sparql/algebra/op/OpGroup.java  |  6 ++--
 .../apache/jena/sparql/algebra/op/OpLabel.java  |  6 ++--
 .../jena/sparql/algebra/op/OpProject.java       |  4 +--
 .../optimize/TransformFilterPlacement.java      |  3 +-
 .../jena/sparql/core/DatasetChangesBatched.java |  8 +++---
 .../sparql/core/DatasetGraphCollection.java     |  4 +--
 .../org/apache/jena/sparql/core/Prologue.java   |  7 +++--
 .../java/org/apache/jena/sparql/core/Quad.java  |  7 +++--
 .../apache/jena/sparql/core/QueryCompare.java   |  4 ++-
 .../apache/jena/sparql/core/VarExprList.java    |  4 +--
 .../jena/sparql/engine/binding/BindingBase.java |  4 +--
 .../apache/jena/sparql/expr/ExprAggregator.java |  7 ++---
 .../apache/jena/sparql/expr/ExprFunction.java   |  4 +--
 .../jena/sparql/expr/aggregate/AggCustom.java   |  6 ++--
 .../sparql/expr/aggregate/AggGroupConcat.java   |  5 ++--
 .../expr/aggregate/AggGroupConcatDistinct.java  |  5 ++--
 .../jena/sparql/expr/aggregate/AggMax.java      |  5 ++--
 .../sparql/expr/aggregate/AggMaxDistinct.java   |  5 ++--
 .../jena/sparql/expr/aggregate/AggMin.java      |  5 ++--
 .../sparql/expr/aggregate/AggMinDistinct.java   |  5 ++--
 .../jena/sparql/expr/aggregate/AggSample.java   |  5 ++--
 .../jena/sparql/graph/NodeTransformLib.java     |  7 ++---
 .../jena/sparql/modify/request/UpdateLoad.java  |  5 ++--
 .../org/apache/jena/sparql/path/PathLib.java    |  4 +--
 .../jena/sparql/resultset/ResultSetCompare.java |  4 +--
 .../org/apache/jena/atlas/iterator/Action.java  |  1 +
 .../org/apache/jena/atlas/iterator/Filter.java  |  1 +
 .../atlas/iterator/FilterDistinctAdjacent.java  |  5 ++--
 .../jena/atlas/iterator/IteratorArray.java      |  2 +-
 .../apache/jena/atlas/iterator/Transform.java   |  1 +
 .../org/apache/jena/atlas/lib/Closeable.java    |  2 +-
 .../java/org/apache/jena/atlas/lib/Lib.java     |  1 +
 .../java/org/apache/jena/atlas/lib/Pair.java    |  4 ++-
 .../org/apache/jena/atlas/lib/cache/Cache1.java |  4 +--
 .../java/org/apache/jena/fuseki/FusekiCmd.java  |  5 ++--
 .../jena/fuseki/servlets/ResponseResultSet.java | 16 +++++------
 .../apache/jena/fuseki/server/FusekiServer.java |  5 ++--
 .../jena/fuseki/servlets/ResponseResultSet.java | 16 +++++------
 .../java/org/apache/jena/sdb/util/Pair.java     |  5 ++--
 .../org/apache/jena/tdb/base/file/Location.java |  4 +--
 .../org/apache/jena/tdb/base/file/MetaFile.java |  5 ++--
 .../store/bulkloader2/CmdNodeTableBuilder.java  |  5 ++--
 .../java/org/apache/jena/tdb/sys/FileRef.java   |  4 +--
 59 files changed, 175 insertions(+), 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/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 feb3072..50336f1 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
@@ -21,8 +21,8 @@ package org.apache.jena.atlas.json ;
 import java.math.BigDecimal ;
 import java.util.ArrayDeque ;
 import java.util.Deque ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.logging.Log ;
 
 /* Builder pattern for JSON.
@@ -90,7 +90,7 @@ public class JsonBuilder {
         if ( stack.isEmpty() )
             builtValue = value ;
         String startMarker = markers.pop(); 
-        if ( ! Lib.equal(startMarker, finishMarker) )
+        if ( ! Objects.equals(startMarker, finishMarker) )
             throw new JsonException("JSON build error : start/finish alignment error: start="+startMarker+"  finish="+finishMarker) ;
         return this ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java b/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
index b911250..3cafb3e 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
@@ -18,11 +18,11 @@
 
 package org.apache.jena.atlas.web ;
 
-import static org.apache.jena.atlas.lib.Lib.equal ;
 import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
 
 import java.util.LinkedHashMap ;
 import java.util.Map ;
+import java.util.Objects;
 
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
@@ -172,7 +172,7 @@ public class MediaType {
         if ( !(object instanceof MediaType) )
             return false ;
         MediaType mt = (MediaType)object ;
-        return equal(type, mt.type) && equal(subType, mt.subType) && equal(params, mt.params) ;
+        return Objects.equals(type, mt.type) && Objects.equals(subType, mt.subType) && Objects.equals(params, mt.params) ;
     }
 
     public String getParameter(String name) {

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java b/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java
index 424960e..021f70d 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java
@@ -18,8 +18,9 @@
 
 package org.apache.jena.query;
 
+import java.util.Objects;
+
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.core.Var ;
@@ -125,7 +126,7 @@ public class SortCondition extends PrintSerializableBase
         if ( sc.getDirection() != this.getDirection() )
             return false ;
         
-        if ( ! Lib.equal(this.getExpression(), sc.getExpression()) )
+        if ( ! Objects.equals(this.getExpression(), sc.getExpression()) )
             return false ;
         
 //        if ( ! Utils.eq(this.getVariable(), sc.getVariable()) )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index ae99481..5297ca7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -19,7 +19,8 @@
 package org.apache.jena.riot ;
 
 import static org.apache.jena.riot.RDFLanguages.THRIFT ;
-import org.apache.jena.atlas.lib.Lib ;
+
+import java.util.Objects;
 
 /** Constants for writable formats */
 public class RDFFormat {
@@ -144,9 +145,9 @@ public class RDFFormat {
         if ( getClass() != obj.getClass() )
             return false ;
         RDFFormat other = (RDFFormat)obj ;
-        if ( !Lib.equal(lang, other.lang) )
+        if ( !Objects.equals(lang, other.lang) )
             return false ;
-        if ( !Lib.equal(variant, other.variant) )
+        if ( !Objects.equals(variant, other.variant) )
             return false ;
         return true ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
index 2bda6f4..24ae2fa 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormatVariant.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.riot ;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.util.Symbol ;
 
 /** Modifier for an RDF Format */
@@ -46,7 +47,7 @@ public class RDFFormatVariant {
         if ( getClass() != obj.getClass() )
             return false ;
         RDFFormatVariant other = (RDFFormatVariant)obj ;
-        if ( !Lib.equal(symbol, other.symbol) )
+        if ( !Objects.equals(symbol, other.symbol) )
             return false ;
         return true ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
index dd238d1..aeb37fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
@@ -20,7 +20,6 @@ package org.apache.jena.riot;
 
 import java.util.* ;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.riot.out.CharSpace ;
 import org.apache.jena.riot.out.JsonLDWriter ;
 import org.apache.jena.riot.system.RiotLib ;
@@ -48,23 +47,23 @@ public class RDFWriterRegistry
         {
             // Built-ins
             
-            if ( Lib.equal(RDFFormat.TURTLE_PRETTY, serialization) )
+            if ( Objects.equals(RDFFormat.TURTLE_PRETTY, serialization) )
                 return new TurtleWriter() ;
-            if ( Lib.equal(RDFFormat.TURTLE_BLOCKS, serialization) )
+            if ( Objects.equals(RDFFormat.TURTLE_BLOCKS, serialization) )
                 return new TurtleWriterBlocks() ;
-            if ( Lib.equal(RDFFormat.TURTLE_FLAT, serialization) )
+            if ( Objects.equals(RDFFormat.TURTLE_FLAT, serialization) )
                 return new TurtleWriterFlat() ;
             
-            if ( Lib.equal(RDFFormat.NTRIPLES_UTF8, serialization) )
+            if ( Objects.equals(RDFFormat.NTRIPLES_UTF8, serialization) )
                 return new NTriplesWriter() ;
-            if ( Lib.equal(RDFFormat.NTRIPLES_ASCII, serialization) )
+            if ( Objects.equals(RDFFormat.NTRIPLES_ASCII, serialization) )
                 return new NTriplesWriter(CharSpace.ASCII) ;
             
-            if ( Lib.equal(RDFFormat.RDFJSON, serialization) )
+            if ( Objects.equals(RDFFormat.RDFJSON, serialization) )
                 return new RDFJSONWriter() ;
-            if ( Lib.equal(RDFFormat.RDFXML_PRETTY, serialization) )
+            if ( Objects.equals(RDFFormat.RDFXML_PRETTY, serialization) )
                 return new RDFXMLAbbrevWriter() ;
-            if ( Lib.equal(RDFFormat.RDFXML_PLAIN, serialization) )
+            if ( Objects.equals(RDFFormat.RDFXML_PLAIN, serialization) )
                 return new RDFXMLPlainWriter() ;
             
             WriterDatasetRIOT dsw = wdsfactory.create(serialization) ;
@@ -78,17 +77,17 @@ public class RDFWriterRegistry
         @Override
         public WriterDatasetRIOT create(RDFFormat serialization)
         {
-            if ( Lib.equal(RDFFormat.TRIG_PRETTY, serialization) )
+            if ( Objects.equals(RDFFormat.TRIG_PRETTY, serialization) )
                 return new TriGWriter() ;
-            if ( Lib.equal(RDFFormat.TRIG_BLOCKS, serialization) )
+            if ( Objects.equals(RDFFormat.TRIG_BLOCKS, serialization) )
                 return new TriGWriterBlocks() ;
-            if ( Lib.equal(RDFFormat.TRIG_FLAT, serialization) )
+            if ( Objects.equals(RDFFormat.TRIG_FLAT, serialization) )
                 return new TriGWriterFlat() ;
-            if ( Lib.equal(RDFFormat.NQUADS_UTF8, serialization) )
+            if ( Objects.equals(RDFFormat.NQUADS_UTF8, serialization) )
                 return new NQuadsWriter() ;
-            if ( Lib.equal(RDFFormat.NQUADS_ASCII, serialization) )
+            if ( Objects.equals(RDFFormat.NQUADS_ASCII, serialization) )
                 return new NQuadsWriter(CharSpace.ASCII) ;
-            if ( Lib.equal(RDFFormat.RDFNULL, serialization) )
+            if ( Objects.equals(RDFFormat.RDFNULL, serialization) )
                 return NullWriter.factory.create(RDFFormat.RDFNULL) ;
             return null ;
     }} ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
index a324222..6d58bf7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
@@ -20,8 +20,8 @@ package org.apache.jena.riot.adapters;
 
 import java.io.InputStream ;
 import java.io.Reader ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.web.TypedInputStream ;
 import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.riot.Lang ;
@@ -74,7 +74,7 @@ public class RDFReaderRIOT_Web extends RDFReaderRIOT
         // Reading a URL, no hint language provided.
         // Use the URL structure as the hint.
         Lang lang = null ;
-        if ( ! Lib.equal(contentType, WebContent.contentTypeTextPlain) )
+        if ( ! Objects.equals(contentType, WebContent.contentTypeTextPlain) )
             lang = RDFLanguages.contentTypeToLang(contentType) ; 
         
         if ( lang == null )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
index f381123..e7b758e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
@@ -23,11 +23,11 @@ import java.io.InputStream ;
 import java.io.Reader ;
 import java.util.List ;
 import java.util.Map ;
+import java.util.Objects;
 import java.util.Map.Entry;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.datatypes.RDFDatatype ;
 import org.apache.jena.datatypes.xsd.XSDDatatype ;
@@ -155,7 +155,7 @@ public class JsonLDReader implements ReaderRIOT
         else if ( type.equals(LITERAL) ) {
             String lang = (String)map.get("language") ;
             String datatype = (String)map.get("datatype") ;
-            if ( Lib.equal(xsdString, datatype) )
+            if ( Objects.equals(xsdString, datatype) )
                 // In RDF 1.1, simple literals and xsd:string are the same.
                 // During migration, we prefer simple literals to xsd:strings. 
                 datatype = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
index e39209c..d3eedd5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/other/BatchedStreamRDF.java
@@ -20,8 +20,8 @@ package org.apache.jena.riot.other;
 
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.riot.system.StreamRDF ;
@@ -64,7 +64,7 @@ public class BatchedStreamRDF implements StreamRDF
 //        Node p = triple.getPredicate() ;
 //        Node o = triple.getObject() ;
 
-        if ( ! Lib.equal(s, currentSubject) )
+        if ( ! Objects.equals(s, currentSubject) )
         {
             if ( currentSubject != null )
                 finishBatchTriple(currentSubject) ;
@@ -110,7 +110,7 @@ public class BatchedStreamRDF implements StreamRDF
 //            Node p = triple.getPredicate() ;
 //            Node o = triple.getObject() ;
         
-        if ( ! Lib.equal(g, currentGraph) || ! Lib.equal(s,  currentSubject) )
+        if ( ! Objects.equals(g, currentGraph) || ! Objects.equals(s,  currentSubject) )
         {
             if ( currentSubject != null )
                 finishBatchQuad(currentGraph, currentSubject) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java b/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java
index 0e0c8af..0841c50 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java
@@ -19,10 +19,10 @@
 package org.apache.jena.riot.out ;
 
 import java.io.OutputStream ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.lib.Closeable ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
@@ -83,7 +83,7 @@ public class SinkQuadBracedOutput implements Sink<Quad>, Closeable
             graphName = null ;
         }
 
-        if ( !Lib.equal(currentGraph, graphName) ) {
+        if ( !Objects.equals(currentGraph, graphName) ) {
             if ( null != currentGraph ) {
                 out.decIndent(BLOCK_INDENT) ;
                 out.println("}") ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
index 4f39429..7046545 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
@@ -27,7 +27,6 @@ import static org.apache.jena.atlas.lib.Chars.CH_RBRACE ;
 import static org.apache.jena.atlas.lib.Chars.CH_RBRACKET ;
 import static org.apache.jena.atlas.lib.Chars.CH_RPAREN ;
 import static org.apache.jena.atlas.lib.Chars.CH_SEMICOLON ;
-import static org.apache.jena.atlas.lib.Lib.equal ;
 import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
 import static org.apache.jena.riot.tokens.TokenType.BNODE ;
 import static org.apache.jena.riot.tokens.TokenType.DECIMAL ;
@@ -41,6 +40,7 @@ import static org.apache.jena.riot.tokens.TokenType.VAR ;
 
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.PeekReader ;
 import org.apache.jena.atlas.iterator.Iter ;
@@ -498,10 +498,10 @@ public final class Token
     {
         if ( ! ( other instanceof Token ) ) return false ;
         Token t = (Token)other ;
-        return  equal(tokenType, t.tokenType) &&
-                equal(tokenImage, t.tokenImage) &&
-                equal(tokenImage2, t.tokenImage2) &&
-                equal(cntrlCode, t.cntrlCode) ;
+        return  Objects.equals(tokenType, t.tokenType) &&
+        		Objects.equals(tokenImage, t.tokenImage) &&
+        		Objects.equals(tokenImage2, t.tokenImage2) &&
+        		Objects.equals(cntrlCode, t.cntrlCode) ;
     }
     
     public static Token tokenForChar(char character)

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index e3acd10..9b1bb21 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -38,7 +38,6 @@ import java.util.* ;
 import org.apache.jena.atlas.io.IndentedWriter ;
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.Pair ;
 import org.apache.jena.atlas.lib.SetUtils ;
 import org.apache.jena.graph.Graph ;
@@ -299,14 +298,14 @@ public abstract class TurtleShell {
                 if ( ! isDefaultGraph(graphName) )
                     return false ;
             } else { 
-                if ( ! Lib.equal(gn, graphName) )
+                if ( ! Objects.equals(gn, graphName) )
                     // Not both same named graph
                     return false ;
             }
             // Check rest of iterator.
             for ( ; iter.hasNext() ; ) {
                 Quad q2 = iter.next() ;
-                if ( ! Lib.equal(gn, q2.getGraph()) )
+                if ( ! Objects.equals(gn, q2.getGraph()) )
                     return false ;    
             }
             return true ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java
index fb16cee..87573d5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java
@@ -22,9 +22,9 @@ import java.io.OutputStream ;
 import java.io.Writer ;
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.sparql.core.Quad ;
@@ -79,7 +79,7 @@ abstract class WriterStreamRDFBatched extends WriterStreamRDFBase
         Node g = quad.getGraph() ;
         Node s = quad.getSubject() ;
 
-        if ( !Lib.equal(g, currentGraph) || !Lib.equal(s, currentSubject) ) {
+        if ( !Objects.equals(g, currentGraph) || !Objects.equals(s, currentSubject) ) {
             if ( currentSubject != null ) {
                 if ( currentGraph == null )
                     finishBatchTriples(currentSubject) ;
@@ -96,7 +96,7 @@ abstract class WriterStreamRDFBatched extends WriterStreamRDFBase
     @Override
     protected final void print(Triple triple) {
         Node s = triple.getSubject() ;
-        if ( !Lib.equal(s, currentSubject) ) {
+        if ( !Objects.equals(s, currentSubject) ) {
             if ( currentSubject != null )
                 finishBatchTriples(currentSubject) ;
             startBatchTriple(s) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java
index 6173bdb..64b4297 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java
@@ -18,15 +18,13 @@
 
 package org.apache.jena.riot.writer;
 
-import static org.apache.jena.atlas.lib.Lib.equal ;
-
 import java.io.OutputStream ;
 import java.io.Writer ;
 import java.util.Collection ;
 import java.util.List ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.riot.other.GLib ;
@@ -85,7 +83,7 @@ public class WriterStreamRDFBlocks extends WriterStreamRDFBatched
     protected void printBatchQuads(Node g, Node s, List<Quad> quads) {
         if ( g == null )
             g = Quad.defaultGraphNodeGenerated ;
-        if ( Lib.equal(g, lastGraph) ) {
+        if ( Objects.equals(g, lastGraph) ) {
             // Same graph, different subject.
             out.println(" .") ;
             out.println() ;
@@ -195,7 +193,7 @@ public class WriterStreamRDFBlocks extends WriterStreamRDFBatched
             return ;
 
         // End of graph
-        if ( !equal(lastGraph, g) ) {
+        if ( !Objects.equals(lastGraph, g) ) {
             boolean NL_END = (dftGraph(g) ? NL_GDFT_END : NL_GNMD_END) ;
 
             if ( lastSubject != null )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAssign.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAssign.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAssign.java
index 290af42..8eafaca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAssign.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAssign.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.algebra.op ;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.Transform ;
@@ -108,7 +109,7 @@ public class OpAssign extends OpExtendAssign {
             return false ;
         OpAssign assign = (OpAssign)other ;
 
-        if ( !Lib.equal(assignments, assign.assignments) )
+        if ( !Objects.equals(assignments, assign.assignments) )
             return false ;
         return getSubOp().equalTo(assign.getSubOp(), labelMap) ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpExtend.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpExtend.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpExtend.java
index 32c4daf..88c1cbe 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpExtend.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpExtend.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.algebra.op ;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.Transform ;
@@ -112,7 +113,7 @@ public class OpExtend extends OpExtendAssign {
             return false ;
         OpExtend assign = (OpExtend)other ;
 
-        if ( !Lib.equal(assignments, assign.assignments) )
+        if ( !Objects.equals(assignments, assign.assignments) )
             return false ;
         return getSubOp().equalTo(assign.getSubOp(), labelMap) ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpGroup.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpGroup.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpGroup.java
index b80c0f1..73b2a9c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpGroup.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpGroup.java
@@ -19,8 +19,8 @@
 package org.apache.jena.sparql.algebra.op;
 
 import java.util.List ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.Transform ;
@@ -71,9 +71,9 @@ public class OpGroup extends Op1
     {
         if ( ! (other instanceof OpGroup) ) return false ;
         OpGroup opGroup = (OpGroup)other ;
-        if ( ! Lib.equal(groupVars, opGroup.groupVars) ) 
+        if ( ! Objects.equals(groupVars, opGroup.groupVars) ) 
             return false ;
-        if ( ! Lib.equal(aggregators, opGroup.aggregators) )
+        if ( ! Objects.equals(aggregators, opGroup.aggregators) )
             return false ;
             
         return getSubOp().equalTo(opGroup.getSubOp(), labelMap) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpLabel.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpLabel.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpLabel.java
index 2d9449f..d2f4764 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpLabel.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpLabel.java
@@ -18,6 +18,8 @@
 
 package org.apache.jena.sparql.algebra.op;
 
+import java.util.Objects;
+
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
@@ -51,10 +53,10 @@ public class OpLabel extends Op1
         if ( !(other instanceof OpLabel) )
             return false ;
         OpLabel opLabel = (OpLabel)other ;
-        if ( !Lib.equal(object, opLabel.object) )
+        if ( !Objects.equals(object, opLabel.object) )
             return false ;
 
-        return Lib.equal(getSubOp(), opLabel.getSubOp()) ;
+        return Objects.equals(getSubOp(), opLabel.getSubOp()) ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpProject.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpProject.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpProject.java
index 978a48f..8b8eda2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpProject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpProject.java
@@ -20,8 +20,8 @@ package org.apache.jena.sparql.algebra.op;
 
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.sparql.algebra.Op ;
 import org.apache.jena.sparql.algebra.OpVisitor ;
 import org.apache.jena.sparql.algebra.Transform ;
@@ -63,7 +63,7 @@ public class OpProject extends OpModifier
     {
         if ( ! (other instanceof OpProject) ) return false ;
         OpProject opProject = (OpProject)other ;
-        if ( ! Lib.equal(vars, opProject.vars ) )
+        if ( ! Objects.equals(vars, opProject.vars ) )
             return false ;
         return getSubOp().equalTo(opProject.getSubOp(), labelMap) ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
index 9dff996..fb90412 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.algebra.optimize ;
 import java.util.Collection ;
 import java.util.Iterator ;
 import java.util.List ;
+import java.util.Objects;
 import java.util.Set ;
 
 import org.apache.jena.atlas.lib.CollectionUtils ;
@@ -68,7 +69,7 @@ public class TransformFilterPlacement extends TransformCopy {
             if ( obj == null ) return false ;
             if ( getClass() != obj.getClass() ) return false ;
             Placement other = (Placement)obj ;
-            return Lib.equal(op, other.op) && Lib.equal(unplaced, other.unplaced) ;
+            return Objects.equals(op, other.op) && Objects.equals(unplaced, other.unplaced) ;
         }
     }
     

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesBatched.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesBatched.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesBatched.java
index af1ad1f..5e71afd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesBatched.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesBatched.java
@@ -20,8 +20,8 @@ package org.apache.jena.sparql.core;
 
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 
 /** Collect a stream of DatasetChanges into batches.
@@ -69,9 +69,9 @@ public abstract class DatasetChangesBatched implements DatasetChanges
                 startBatch() ;
             // Drop and through and include in the current batch.
         }
-        else if ( ! Lib.equal(currentAction, qaction) ||
-                  ! Lib.equal(currentGraph, g) ||
-                  ! Lib.equal(currentSubject, s) )
+        else if ( ! Objects.equals(currentAction, qaction) ||
+                  ! Objects.equals(currentGraph, g) ||
+                  ! Objects.equals(currentSubject, s) )
         {
             finishBatch() ;
             startBatch() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCollection.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCollection.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCollection.java
index b48769b..7b66d64 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCollection.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCollection.java
@@ -19,10 +19,10 @@
 package org.apache.jena.sparql.core;
 
 import java.util.Iterator ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.iterator.IteratorConcat;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Graph ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.shared.JenaException ;
@@ -100,7 +100,7 @@ public abstract class DatasetGraphCollection extends DatasetGraphBaseFind
     
     protected Graph fetchGraph(Node gn)
     {
-        if ( Quad.isDefaultGraph(gn) || Lib.equal(gn,Quad.tripleInQuad)) // Not preferred style
+        if ( Quad.isDefaultGraph(gn) || Objects.equals(gn,Quad.tripleInQuad)) // Not preferred style
             return getDefaultGraph() ;
         else
             return getGraph(gn) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
index c2a839b..ca4ff73 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.core;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.riot.system.IRIResolver ;
 import org.apache.jena.shared.PrefixMapping ;
@@ -137,7 +138,7 @@ public class Prologue
             // Removal may involve regeneration of the reverse mapping
             // so only do if needed.   
             String oldExpansion = prefixMap.getNsPrefixURI(prefix) ;
-            if ( Lib.equal(oldExpansion, expansion) )
+            if ( Objects.equals(oldExpansion, expansion) )
                 return ;
             if ( oldExpansion != null )
                 prefixMap.removeNsPrefix(prefix) ;
@@ -199,7 +200,7 @@ public class Prologue
         // Prologue are mutable and superclasses so .equals is left as the default.
         String base1 = explicitlySetBaseURI() ? getBaseURI() : null ;
         String base2 = other.explicitlySetBaseURI() ? other.getBaseURI() : null ;        
-        if (! Lib.equal(base1,  base2) )
+        if (! Objects.equals(base1,  base2) )
             return false ;
         if ( getPrefixMapping() == null && other.getPrefixMapping() == null )
             return true ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/Quad.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Quad.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Quad.java
index 8720fc6..f21266d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Quad.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Quad.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.core;
 
-import static org.apache.jena.atlas.lib.Lib.equal ;
+import java.util.Objects;
+
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.graph.Triple ;
@@ -138,7 +139,7 @@ public class Quad
     public boolean isUnionGraph()           { return isUnionGraph(graph) ; }
 
     /** Is it really a triple? */  
-    public boolean isTriple()               { return equal(graph, tripleInQuad) ; } 
+    public boolean isTriple()               { return Objects.equals(graph, tripleInQuad) ; } 
 
     /** Is this quad a legal data quad (legal data triple, IRI for graph) */   
     public boolean isLegalAsData()
@@ -190,7 +191,7 @@ public class Quad
             return false ;
         Quad quad = (Quad)other ;
         
-        if ( ! equal(graph, quad.graph) ) return false ;
+        if ( ! Objects.equals(graph, quad.graph) ) return false ;
         if ( ! subject.equals(quad.subject) ) return false ;
         if ( ! predicate.equals(quad.predicate) ) return false ;
         if ( ! object.equals(quad.object) ) return false ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/QueryCompare.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/QueryCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/QueryCompare.java
index b64209e..a2c2ea9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/QueryCompare.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/QueryCompare.java
@@ -18,6 +18,8 @@
 
 package org.apache.jena.sparql.core ;
 
+import java.util.Objects;
+
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.query.Query ;
 import org.apache.jena.query.QueryVisitor ;
@@ -171,7 +173,7 @@ public class QueryCompare implements QueryVisitor
     
     private void check(String msg, Object obj1, Object obj2)
     {
-        check(msg, Lib.equal(obj1,obj2)) ;
+        check(msg, Objects.equals(obj1,obj2)) ;
     }
     
     private void check(String msg, boolean b)

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java
index a45e154..3e641f7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/VarExprList.java
@@ -22,8 +22,8 @@ import java.util.ArrayList ;
 import java.util.HashMap ;
 import java.util.List ;
 import java.util.Map ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.ARQInternalErrorException ;
 import org.apache.jena.sparql.engine.binding.Binding ;
@@ -141,7 +141,7 @@ public class VarExprList
         if ( ! ( other instanceof VarExprList ) )
             return false ;
         VarExprList x = (VarExprList)other ;
-        return Lib.equal(vars, x.vars) && Lib.equal(exprs, x.exprs) ;
+        return Objects.equals(vars, x.vars) && Objects.equals(exprs, x.exprs) ;
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingBase.java
index e16e786..cc024b8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingBase.java
@@ -19,9 +19,9 @@
 package org.apache.jena.sparql.engine.binding;
 
 import java.util.Iterator ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.iterator.IteratorConcat ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.core.Var ;
 import org.apache.jena.sparql.util.FmtUtils ;
@@ -219,7 +219,7 @@ abstract public class BindingBase implements Binding
             Var var = iter1.next() ; 
             Node node1 = bind1.get(var) ;
             Node node2 = bind2.get(var) ;
-            if ( ! Lib.equal(node1, node2) )
+            if ( ! Objects.equals(node1, node2) )
                 return false ;
         }
         

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
index 5f1794e..24a2fa5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
@@ -18,8 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import static org.apache.jena.atlas.lib.Lib.equal ;
-
+import java.util.Objects;
 import java.util.function.Function;
 
 import org.apache.jena.atlas.lib.Lib ;
@@ -80,9 +79,9 @@ public class ExprAggregator extends ExprNode
         if ( ! ( other instanceof ExprAggregator ) )
             return false ;
         ExprAggregator agg = (ExprAggregator)other ;
-        if ( ! equal(var, agg.var) )
+        if ( ! Objects.equals(var, agg.var) )
             return false ;
-        return equal(aggregator, agg.aggregator) ;
+        return Objects.equals(aggregator, agg.aggregator) ;
     }
 
     // Ensure no confusion - in an old design, an ExprAggregator was a subclass of ExprVar. 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
index a9a8f59..f568d89 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
@@ -20,8 +20,8 @@ package org.apache.jena.sparql.expr;
 
 import java.util.ArrayList ;
 import java.util.List ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.sparql.serializer.SerializationContext ;
 
 /** A function in the expression hierarchy.
@@ -98,7 +98,7 @@ public abstract class ExprFunction extends ExprNode
         {
             Expr a1 = this.getArg(i) ;
             Expr a2 = ex.getArg(i) ;
-            if ( ! Lib.equal(a1, a2) )
+            if ( ! Objects.equals(a1, a2) )
                 return false ;
         }
         return true ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
index cc09301..db3c0f9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
@@ -19,9 +19,9 @@
 package org.apache.jena.sparql.expr.aggregate;
 
 import java.util.Locale ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.IndentedLineBuffer ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.query.QueryExecException ;
 import org.apache.jena.sparql.engine.binding.Binding ;
@@ -142,9 +142,9 @@ public class AggCustom extends AggregatorBase
             return false ;
         AggCustom agg = (AggCustom)other ;
         return 
-            Lib.equal(this.iri, agg.iri) &&
+        		Objects.equals(this.iri, agg.iri) &&
             this.isDistinct == agg.isDistinct &&
-            Lib.equal(this.getExprList(), agg.getExprList()) ;
+            	Objects.equals(this.getExprList(), agg.getExprList()) ;
     } 
 
     public static Accumulator createAccNull() { return new  AccCustom() ; }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
index 9d076d1..700b18c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
@@ -18,8 +18,9 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
+import java.util.Objects;
+
 import org.apache.jena.atlas.io.IndentedLineBuffer ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.engine.binding.Binding ;
@@ -129,7 +130,7 @@ public class AggGroupConcat extends AggregatorBase
         if ( ! ( other instanceof AggGroupConcat ) )
             return false ;
         AggGroupConcat agg = (AggGroupConcat)other ;
-        return Lib.equal(agg.getSeparator(),getSeparator()) && agg.getExpr().equals(getExpr()) ;
+        return Objects.equals(agg.getSeparator(),getSeparator()) && agg.getExpr().equals(getExpr()) ;
     }
 
     // ---- Accumulator

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
index 9f99594..ad3b422 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.engine.binding.Binding ;
 import org.apache.jena.sparql.expr.Expr ;
@@ -80,7 +81,7 @@ public class AggGroupConcatDistinct extends AggregatorBase
         if ( ! ( other instanceof AggGroupConcatDistinct ) )
             return false ;
         AggGroupConcatDistinct agg = (AggGroupConcatDistinct)other ;
-        return Lib.equal(agg.getSeparator(),getSeparator()) && agg.getExpr().equals(getExpr()) ;
+        return Objects.equals(agg.getSeparator(),getSeparator()) && agg.getExpr().equals(getExpr()) ;
     }
     
     // ---- Accumulator

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMax.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMax.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMax.java
index acf31a5..539a1ab 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMax.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMax.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
 
@@ -39,6 +40,6 @@ public class AggMax extends AggMaxBase
         if ( ! ( other instanceof AggMax ) )
             return false ;
         AggMax agg = (AggMax)other ;
-        return Lib.equal(exprList, agg.exprList) ;
+        return Objects.equals(exprList, agg.exprList) ;
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxDistinct.java
index f3c576a..c994c2c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxDistinct.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
 
@@ -39,7 +40,7 @@ public class AggMaxDistinct extends AggMaxBase
         if ( ! ( other instanceof AggMaxDistinct ) )
             return false ;
         AggMaxDistinct agg = (AggMaxDistinct)other ;
-        return Lib.equal(exprList, agg.exprList) ;
+        return Objects.equals(exprList, agg.exprList) ;
     }
 
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMin.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMin.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMin.java
index f5a567f..79e634a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMin.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMin.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
 
@@ -39,6 +40,6 @@ public class AggMin extends AggMinBase
         if ( ! ( other instanceof AggMin ) )
             return false ;
         AggMin agg = (AggMin)other ;
-        return Lib.equal(exprList, agg.exprList) ;
+        return Objects.equals(exprList, agg.exprList) ;
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinDistinct.java
index c7c388c..be774d7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinDistinct.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
 
@@ -38,6 +39,6 @@ public class AggMinDistinct extends AggMinBase
         if ( ! ( other instanceof AggMinDistinct ) )
             return false ;
         AggMinDistinct agg = (AggMinDistinct)other ;
-        return Lib.equal(exprList, agg.exprList) ;
+        return Objects.equals(exprList, agg.exprList) ;
     } 
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
index 912ff39..c153af0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.expr.aggregate;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.engine.binding.Binding ;
 import org.apache.jena.sparql.expr.Expr ;
@@ -52,7 +53,7 @@ public class AggSample extends AggregatorBase
         if ( ! ( other instanceof AggSample ) )
             return false ;
         AggSample agg = (AggSample)other ;
-        return Lib.equal(this.exprList, agg.exprList) ;
+        return Objects.equals(this.exprList, agg.exprList) ;
     } 
 
     // ---- Accumulator

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/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 94314c2..34ba4fb 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
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.graph;
 import java.util.ArrayList ;
 import java.util.Iterator ;
 import java.util.List ;
+import java.util.Objects;
 import java.util.function.Function;
 
 import org.apache.jena.atlas.iterator.Iter ;
@@ -39,8 +40,6 @@ import org.apache.jena.sparql.engine.binding.BindingMap ;
 import org.apache.jena.sparql.expr.Expr ;
 import org.apache.jena.sparql.expr.ExprList ;
 
-import static org.apache.jena.atlas.lib.Lib.equal ;
-
 public class NodeTransformLib
 {
     /** Do a node->node conversion of an Op - return original BGP for "no change" */
@@ -180,7 +179,7 @@ public class NodeTransformLib
             Var v2 = (Var)nodeTransform.apply(v) ;
             Expr expr2 = ( expr != null ) ? transform(nodeTransform, expr) : null ;
             
-            if ( ! equal(v, v2) || ! equal(expr, expr2) )
+            if ( ! Objects.equals(v, v2) || ! Objects.equals(expr, expr2) )
                 changed = true ;
             varExprList2.add(v2, expr2) ;
         }
@@ -197,7 +196,7 @@ public class NodeTransformLib
         {
             Var v2 = (Var)nodeTransform.apply(v) ;
             varList2.add(v2) ;
-            if ( !equal(v, v2) )
+            if ( !Objects.equals(v, v2) )
                 changed = true ;
         }
         if ( ! changed )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateLoad.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateLoad.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateLoad.java
index fc0a1dd..efb605b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateLoad.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateLoad.java
@@ -18,7 +18,8 @@
 
 package org.apache.jena.sparql.modify.request;
 
-import org.apache.jena.atlas.lib.Lib ;
+import java.util.Objects;
+
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.sparql.util.Iso ;
@@ -73,7 +74,7 @@ public class UpdateLoad extends Update
         UpdateLoad other = (UpdateLoad)obj ;
         return 
             silent == other.silent &&
-            Lib.equal(source, other.source) &&
+            	Objects.equals(source, other.source) &&
             Iso.nodeIso(dest, other.dest, isoMap) ;
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/path/PathLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/PathLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/PathLib.java
index c2db208..465f359 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/path/PathLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/PathLib.java
@@ -21,10 +21,10 @@ package org.apache.jena.sparql.path;
 import java.util.ArrayList ;
 import java.util.Iterator ;
 import java.util.List ;
+import java.util.Objects;
 import java.util.function.Predicate;
 
 import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Graph ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.sparql.ARQInternalErrorException ;
@@ -247,7 +247,7 @@ public class PathLib
         if ( ! subject.isConcrete() || !object.isConcrete() )
             throw new ARQInternalErrorException("Non concrete node for existsPath evaluation") ;
         Iterator<Node> iter = PathEval.eval(graph, subject, path, execCxt.getContext()) ;
-        Predicate<Node> filter = node -> Lib.equal(node,  object); 
+        Predicate<Node> filter = node -> Objects.equals(node,  object); 
         // See if we got to the node we're interested in finishing at.
         iter = Iter.filter(iter, filter) ;
         long x = Iter.count(iter) ; 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
index 99413a5..d0dfa27 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
@@ -19,8 +19,8 @@
 package org.apache.jena.sparql.resultset;
 
 import java.util.* ;
+
 import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.query.* ;
 import org.apache.jena.rdf.model.Model ;
@@ -333,7 +333,7 @@ public class ResultSetCompare
     private static class EqualityTestExact implements EqualityTest {
         @Override
         public boolean equal(Node n1, Node n2) {
-            return Lib.equal(n1, n2) ;
+            return Objects.equals(n1, n2) ;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Action.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Action.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Action.java
index d9c14ab..73756dc 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Action.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Action.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.iterator;
 import java.util.function.Consumer;
 
 /**
+ * @deprecated
  * Prefer {@link Consumer}
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Filter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Filter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Filter.java
index 689f5bc..8545eab 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Filter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Filter.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.iterator;
 import java.util.function.Predicate;
 
 /**
+ * @deprecated
  * Prefer {@link Predicate}.
  */
 @FunctionalInterface

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java
index e2bc4b4..f4c0ddf 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java
@@ -18,10 +18,9 @@
 
 package org.apache.jena.atlas.iterator;
 
+import java.util.Objects;
 import java.util.function.Predicate;
 
-import org.apache.jena.atlas.lib.Lib ;
-
 public class FilterDistinctAdjacent<T> implements Predicate<T>
 {
     private boolean isSet = false ;
@@ -30,7 +29,7 @@ public class FilterDistinctAdjacent<T> implements Predicate<T>
     @Override
     public boolean test(T item)
     {
-        if ( isSet && Lib.equal(last, item) )
+        if ( isSet && Objects.equals(last, item) )
             return false ;
         last = item ;
         isSet = true ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
index 70a8f26..2c97ca7 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
@@ -21,10 +21,10 @@ package org.apache.jena.atlas.iterator;
 import java.util.Arrays;
 import java.util.Iterator ;
 import java.util.NoSuchElementException ;
-import java.util.Spliterator;
 
 /** Iterator over a Java base array */
 /**
+ * @deprecated
  * Prefer {@link Arrays#asList(Object...)} with {@link Iterable#iterator()} or
  * {@link Arrays#spliterator(Object[])} or {@link Arrays#stream(Object[])}
  */

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Transform.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Transform.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Transform.java
index 67fc3af..2a070ab 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Transform.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Transform.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.iterator;
 import java.util.function.Function;
 
 /**
+ * @deprecated
  * Prefer {@link Function}.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/lib/Closeable.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Closeable.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Closeable.java
index e2f6dfd..2b6002a 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Closeable.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Closeable.java
@@ -21,7 +21,7 @@ package org.apache.jena.atlas.lib;
 /** Close this object.
  *  This form does not allow Exceptions (it does allow RuntimeExceptions).  
  */
-public interface Closeable extends java.io.Closeable
+public interface Closeable
 {
     public void close() ;
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/lib/Lib.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Lib.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Lib.java
index a866d59..181fe88 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Lib.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Lib.java
@@ -37,6 +37,7 @@ public class Lib
     }
     
     /** Return true if obj1 and obj are both null or are .equals, else return false 
+     * @deprecated
      * Prefer {@link Objects#equal(Object, Object)}
      */
     @Deprecated

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java
index 4f3b055..b472f3d 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Pair.java
@@ -21,6 +21,8 @@ package org.apache.jena.atlas.lib;
 import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
 import static org.apache.jena.atlas.lib.StrUtils.str ;
 
+import java.util.Objects;
+
 public class Pair<A, B>
 {
     public static <L, R> Pair<L,R> create(L x, R y) { return new Pair<>(x,y) ; }
@@ -54,7 +56,7 @@ public class Pair<A, B>
         
         if( ! ( other instanceof Pair<?,?> ) ) return false ;
         Pair<?,?> p2 = (Pair<?,?>)other ;
-        return  Lib.equal(car(), p2.car()) && Lib.equal(cdr(), p2.cdr()) ;
+        return Objects.equals(car(), p2.car()) && Objects.equals(cdr(), p2.cdr()) ;
     }
     
     @Override 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java
index ffa6e0a..31436b1 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java
@@ -19,12 +19,12 @@
 package org.apache.jena.atlas.lib.cache;
 
 import java.util.Iterator ;
+import java.util.Objects;
 import java.util.concurrent.Callable ;
 import java.util.function.BiConsumer;
 
 import org.apache.jena.atlas.iterator.SingletonIterator ;
 import org.apache.jena.atlas.lib.Cache ;
-import org.apache.jena.atlas.lib.Lib ;
 
 /** A one-slot cache.*/
 public class Cache1<K, V> implements Cache<K,V>
@@ -85,7 +85,7 @@ public class Cache1<K, V> implements Cache<K,V>
     @Override
     public void put(K key, V thing)
     {
-        if ( Lib.equal(cacheKey, key) && Lib.equal(cacheValue, thing) )
+        if ( Objects.equals(cacheKey, key) && Objects.equals(cacheValue, thing) )
             // No change.
             return ;
 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index 2ee8248..995c5d7 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -23,10 +23,10 @@ import static org.apache.jena.fuseki.Fuseki.serverLog ;
 import java.io.File ;
 import java.io.InputStream ;
 import java.util.List ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.fuseki.mgt.ManagementServer ;
@@ -47,6 +47,7 @@ import org.apache.jena.tdb.sys.Names ;
 import org.apache.jena.tdb.transaction.TransactionManager ;
 import org.eclipse.jetty.server.Server ;
 import org.slf4j.Logger ;
+
 import arq.cmd.ArgDecl ;
 import arq.cmd.CmdException ;
 import arq.cmdline.CmdARQ ;
@@ -289,7 +290,7 @@ public class FusekiCmd extends CmdARQ
         {
             String dir = getValue(argTDB) ;
             
-            if ( Lib.equal(dir, Names.memName) ) {
+            if ( Objects.equals(dir, Names.memName) ) {
                 log.info("TDB dataset: in-memory") ;
             } else {
                 if ( ! FileOps.exists(dir) )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
index 4278426..35daf70 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
@@ -19,7 +19,6 @@
 package org.apache.jena.fuseki.servlets;
 
 import static java.lang.String.format ;
-import static org.apache.jena.atlas.lib.Lib.equal ;
 import static org.apache.jena.fuseki.servlets.ServletBase.errorBadRequest ;
 import static org.apache.jena.fuseki.servlets.ServletBase.errorOccurred ;
 import static org.apache.jena.fuseki.servlets.ServletBase.log ;
@@ -27,6 +26,7 @@ import static org.apache.jena.fuseki.servlets.ServletBase.log ;
 import java.io.IOException ;
 import java.util.HashMap ;
 import java.util.Map ;
+import java.util.Objects;
 
 import javax.servlet.ServletOutputStream ;
 import javax.servlet.http.HttpServletRequest ;
@@ -129,7 +129,7 @@ public class ResponseResultSet
              
         // Stylesheet - change to application/xml.
         final String stylesheetURL = ResponseOps.paramStylesheet(request) ;
-        if ( stylesheetURL != null && equal(serializationType,WebContent.contentTypeResultsXML) )
+        if ( stylesheetURL != null && Objects.equals(serializationType,WebContent.contentTypeResultsXML) )
             contentType = WebContent.contentTypeXML ;
         
         // Force to text/plain?
@@ -139,17 +139,17 @@ public class ResponseResultSet
 
         // Better : dispatch on MediaType
         // Fuseki2 uses the SPARQL parser/write registry.
-        if ( equal(serializationType, WebContent.contentTypeResultsXML) )
+        if ( Objects.equals(serializationType, WebContent.contentTypeResultsXML) )
             sparqlXMLOutput(action, contentType, resultSet, stylesheetURL, booleanResult) ;
-        else if ( equal(serializationType, WebContent.contentTypeResultsJSON) )
+        else if ( Objects.equals(serializationType, WebContent.contentTypeResultsJSON) )
             jsonOutput(action, contentType, resultSet, booleanResult) ;
-        else if ( equal(serializationType, WebContent.contentTypeTextPlain) )
+        else if ( Objects.equals(serializationType, WebContent.contentTypeTextPlain) )
             textOutput(action, contentType, resultSet, qPrologue, booleanResult) ;
-        else if ( equal(serializationType, WebContent.contentTypeTextCSV) ) 
+        else if ( Objects.equals(serializationType, WebContent.contentTypeTextCSV) ) 
             csvOutput(action, contentType, resultSet, booleanResult) ;
-        else if (equal(serializationType, WebContent.contentTypeTextTSV) )
+        else if (Objects.equals(serializationType, WebContent.contentTypeTextTSV) )
             tsvOutput(action, contentType, resultSet, booleanResult) ;
-        else if (equal(serializationType, WebContent.contentTypeResultsThrift) )
+        else if (Objects.equals(serializationType, WebContent.contentTypeResultsThrift) )
             thriftOutput(action, contentType, resultSet, booleanResult) ;
         else
             errorBadRequest("Can't determine output serialization: "+serializationType) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
index 70a02e0..f6488c5 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
@@ -29,13 +29,14 @@ import java.util.ArrayList ;
 import java.util.HashMap ;
 import java.util.List ;
 import java.util.Map ;
+import java.util.Objects;
 
 import arq.cmd.CmdException ;
+
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.atlas.lib.FileOps ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.fuseki.FusekiConfigException ;
 import org.apache.jena.fuseki.build.Builder ;
@@ -256,7 +257,7 @@ public class FusekiServer
             Fuseki.configLog.info("Template file: " + params.templateFile) ;
             String dir = params.params.get(Template.DIR) ;
             if ( dir != null ) {
-                if ( Lib.equal(dir, Names.memName) ) {
+                if ( Objects.equals(dir, Names.memName) ) {
                     Fuseki.configLog.info("TDB dataset: in-memory") ;
                 } else {
                     if ( !FileOps.exists(dir) )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
index 2ab529b..e22ab13 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
@@ -19,7 +19,6 @@
 package org.apache.jena.fuseki.servlets;
 
 import static java.lang.String.format ;
-import static org.apache.jena.atlas.lib.Lib.equal ;
 import static org.apache.jena.riot.WebContent.charsetUTF8 ;
 import static org.apache.jena.riot.WebContent.contentTypeRDFXML ;
 import static org.apache.jena.riot.WebContent.contentTypeResultsJSON ;
@@ -33,6 +32,7 @@ import static org.apache.jena.riot.WebContent.contentTypeXML ;
 import java.io.IOException ;
 import java.util.HashMap ;
 import java.util.Map ;
+import java.util.Objects;
 
 import javax.servlet.ServletOutputStream ;
 import javax.servlet.http.HttpServletRequest ;
@@ -134,7 +134,7 @@ public class ResponseResultSet
              
         // Stylesheet - change to application/xml.
         final String stylesheetURL = ResponseOps.paramStylesheet(request) ;
-        if ( stylesheetURL != null && equal(serializationType,contentTypeResultsXML) )
+        if ( stylesheetURL != null && Objects.equals(serializationType,contentTypeResultsXML) )
             contentType = contentTypeXML ;
         
         // Force to text/plain?
@@ -143,17 +143,17 @@ public class ResponseResultSet
             contentType = contentTypeTextPlain ;
 
         // Better : dispatch on MediaType
-        if ( equal(serializationType, contentTypeResultsXML) )
+        if ( Objects.equals(serializationType, contentTypeResultsXML) )
             sparqlXMLOutput(action, contentType, resultSet, stylesheetURL, booleanResult) ;
-        else if ( equal(serializationType, contentTypeResultsJSON) )
+        else if ( Objects.equals(serializationType, contentTypeResultsJSON) )
             jsonOutput(action, contentType, resultSet, booleanResult) ;
-        else if ( equal(serializationType, contentTypeTextPlain) )
+        else if ( Objects.equals(serializationType, contentTypeTextPlain) )
             textOutput(action, contentType, resultSet, qPrologue, booleanResult) ;
-        else if ( equal(serializationType, contentTypeTextCSV) ) 
+        else if ( Objects.equals(serializationType, contentTypeTextCSV) ) 
             csvOutput(action, contentType, resultSet, booleanResult) ;
-        else if (equal(serializationType, contentTypeTextTSV) )
+        else if (Objects.equals(serializationType, contentTypeTextTSV) )
             tsvOutput(action, contentType, resultSet, booleanResult) ;
-        else if (equal(serializationType, WebContent.contentTypeResultsThrift) )
+        else if (Objects.equals(serializationType, WebContent.contentTypeResultsThrift) )
             thriftOutput(action, contentType, resultSet, booleanResult) ;
         else
             ServletOps.errorBadRequest("Can't determine output serialization: "+serializationType) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-sdb/src/main/java/org/apache/jena/sdb/util/Pair.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/util/Pair.java b/jena-sdb/src/main/java/org/apache/jena/sdb/util/Pair.java
index 5228e98..acd5abe 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/util/Pair.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/util/Pair.java
@@ -20,7 +20,8 @@ package org.apache.jena.sdb.util;
 
 import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
 import static org.apache.jena.atlas.lib.StrUtils.str ;
-import org.apache.jena.atlas.lib.Lib ;
+
+import java.util.Objects;
 
 public class Pair<A, B>
 {
@@ -53,7 +54,7 @@ public class Pair<A, B>
         
         if( ! ( other instanceof Pair<?,?> ) ) return false ;
         Pair<?,?> p2 = (Pair<?,?>)other ;
-        return Lib.equal(car(), p2.car()) && Lib.equal(cdr(), p2.cdr()) ;
+        return Objects.equals(car(), p2.car()) && Objects.equals(cdr(), p2.cdr()) ;
     }
     
     @Override 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/Location.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/Location.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/Location.java
index 780ec0d..a012a5c 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/Location.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/Location.java
@@ -20,8 +20,8 @@ package org.apache.jena.tdb.base.file ;
 
 import java.io.File ;
 import java.io.IOException ;
+import java.util.Objects;
 
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.tdb.sys.Names ;
 
 /**
@@ -256,7 +256,7 @@ public class Location {
         if ( isMemUnique )
             return false ;
 
-        return Lib.equal(pathname, other.pathname) ;
+        return Objects.equals(pathname, other.pathname) ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/MetaFile.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/MetaFile.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/MetaFile.java
index 66d979a..4062f01 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/MetaFile.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/file/MetaFile.java
@@ -25,6 +25,7 @@ import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.PrintStream ;
 import java.util.Comparator ;
+import java.util.Objects;
 import java.util.Properties ;
 import java.util.SortedSet ;
 import java.util.TreeSet ;
@@ -160,7 +161,7 @@ public class MetaFile implements Sync, Closeable
     /** Test whether a property has a value.  Null tests equal to not present. */
     public boolean propertyEquals(String key, String value)
     {
-        return Lib.equal(getProperty(key), value) ;
+        return Objects.equals(getProperty(key), value) ;
     }
 
     /** Set property if not already set. */
@@ -201,7 +202,7 @@ public class MetaFile implements Sync, Closeable
     {
         String value = getProperty(key) ;
         
-        if ( ! Lib.equal(value, value) )
+        if ( ! Objects.equals(value, value) )
             inconsistent(key, value, expected) ;
     }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
index 3196182..9662c03 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
@@ -23,12 +23,12 @@ import java.io.FileOutputStream ;
 import java.io.OutputStream ;
 import java.util.Arrays ;
 import java.util.List ;
+import java.util.Objects;
 
 import org.apache.jena.atlas.AtlasException ;
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.DateTimeUtils ;
 import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.atlas.logging.ProgressLogger ;
 import org.apache.jena.graph.Node ;
@@ -50,6 +50,7 @@ import org.apache.jena.tdb.store.nodetable.NodeTable ;
 import org.apache.jena.tdb.store.nodetupletable.NodeTupleTable ;
 import org.apache.jena.tdb.sys.Names ;
 import org.slf4j.Logger ;
+
 import tdb.cmdline.CmdTDB ;
 import arq.cmd.ArgDecl ;
 import arq.cmd.CmdException ;
@@ -107,7 +108,7 @@ public class CmdNodeTableBuilder extends CmdGeneral
         if ( dataFileQuads == null )
             dataFileQuads = location.getPath("quads", "tmp") ;
         
-        if ( Lib.equal(dataFileTriples, dataFileQuads) )
+        if ( Objects.equals(dataFileTriples, dataFileQuads) )
             cmdError("Triples and Quads work files are the same") ;
         
         if ( super.contains(argNoStats) )

http://git-wip-us.apache.org/repos/asf/jena/blob/6711901a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java
index c16180c..af70467 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java
@@ -20,10 +20,10 @@ package org.apache.jena.tdb.sys;
 
 import java.util.HashMap ;
 import java.util.Map ;
+import java.util.Objects;
 import java.util.TreeMap ;
 
 import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.atlas.lib.Tuple ;
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.tdb.TDBException ;
@@ -182,7 +182,7 @@ public class FileRef
         if ( id != other.id )
             return false ;
         // Should not be needed.
-        if ( ! Lib.equal(filename, other.filename) ) return false ;
+        if ( ! Objects.equals(filename, other.filename) ) return false ;
         return true ;
     }
 }


Mime
View raw message