jena git commit: Deprecate Jena's Callback in favor of Java API's Consumer

[aj...@apache.org]

Repository: jena
Updated Branches:
  refs/heads/master 3fbbfccf0 -> 26592ee47


Deprecate Jena's Callback<T> in favor of Java API's Consumer<T>


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

Branch: refs/heads/master
Commit: 26592ee47d2203cfa8165d350c4f07908e760ee0
Parents: 3fbbfcc
Author: ajs6f <aj...@apache.org>
Authored: Sun Oct 1 10:00:06 2017 -0400
Committer: ajs6f <aj...@apache.org>
Committed: Sun Oct 1 10:00:06 2017 -0400

----------------------------------------------------------------------
 .../java/org/apache/jena/sparql/util/Context.java     | 14 ++++++--------
 .../main/java/org/apache/jena/atlas/lib/Callback.java | 10 ++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/26592ee4/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
index cfaae9c..20ae076 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
@@ -20,8 +20,8 @@ package org.apache.jena.sparql.util ;
 
 import java.util.* ;
 import java.util.concurrent.ConcurrentHashMap ;
+import java.util.function.Consumer;
 
-import org.apache.jena.atlas.lib.Callback ;
 import org.apache.jena.atlas.lib.Lib ;
 import org.apache.jena.query.ARQ ;
 import org.apache.jena.sparql.ARQConstants ;
@@ -37,7 +37,7 @@ public class Context {
     public static final Context      emptyContext = new Context(true) ;
 
     protected Map<Symbol, Object>    context      = new ConcurrentHashMap<>() ;
-    protected List<Callback<Symbol>> callbacks    = new ArrayList<>() ;
+    protected List<Consumer<Symbol>> callbacks    = new ArrayList<>() ;
     protected boolean                readonly     = false ;
 
     /** Create an empty context */
@@ -316,22 +316,20 @@ public class Context {
     }
 
     // ---- Callbacks
-    public synchronized void addCallback(Callback<Symbol> m) {
+    public synchronized void addCallback(Consumer<Symbol> m) {
         callbacks.add(m) ;
     }
 
-    public synchronized void removeCallback(Callback<Symbol> m) {
+    public synchronized void removeCallback(Consumer<Symbol> m) {
         callbacks.remove(m) ;
     }
 
-    public synchronized List<Callback<Symbol>> getCallbacks() {
+    public synchronized List<Consumer<Symbol>> getCallbacks() {
         return Collections.unmodifiableList(callbacks) ;
     }
 
     private synchronized void doCallbacks(Symbol symbol) {
-        for ( Callback<Symbol> c : callbacks ) {
-            c.apply(symbol) ;
-        }
+        callbacks.forEach(c -> c.accept(symbol));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/26592ee4/jena-base/src/main/java/org/apache/jena/atlas/lib/Callback.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Callback.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Callback.java
index 647625a..1929e62 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Callback.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Callback.java
@@ -18,8 +18,14 @@
 
 package org.apache.jena.atlas.lib;
 
-import java.util.function.Function;
+import java.util.function.Consumer;
 
-public interface Callback<T> extends Function<T, Void>
+/**
+ * Use {@link Consumer} instead.
+ *
+ * @param <T>
+ */
+@Deprecated
+public interface Callback<T> extends Consumer<T>
 {
 }