Use java.util.Consumer instead of os.utils.datastructures.Callback

[simantics/platform.git] / bundles / org.simantics.db.procore / src / fi / vtt / simantics / procore / internal / QuerySupportImpl.java

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QuerySupportImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QuerySupportImpl.java
index 1d3563fc1a3b5fca63688dca04a52c4805bdee50..190db364cbdf8bda86c56cc2c4f427990200c352 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QuerySupportImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QuerySupportImpl.java
@@ -5,6 +5,7 @@ import gnu.trove.set.hash.TIntHashSet;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Collection;
+import java.util.function.Consumer;
 
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -34,7 +35,6 @@ import org.simantics.db.procore.cluster.ClusterImpl;
 import org.simantics.db.procore.cluster.ClusterSmall;
 import org.simantics.db.service.SerialisationSupport;
 import org.simantics.utils.DataContainer;
-import org.simantics.utils.datastructures.Callback;
 
 public class QuerySupportImpl implements QuerySupport {
        
@@ -1336,13 +1336,13 @@ public class QuerySupportImpl implements QuerySupport {
     @Override
     public void requestCluster(ReadGraphImpl graph, final long clusterId, final Runnable r) {
 
-        class CallbackAdapter implements Callback<DatabaseException> {
+        class CallbackAdapter implements Consumer<DatabaseException> {
                final Runnable r;
                CallbackAdapter(final Runnable r) {
                        this.r = r;
                }
                @Override
-               public void run(DatabaseException e) {
+               public void accept(DatabaseException e) {
                        if (null != e)
                                e.printStackTrace();
                        else
@@ -1515,13 +1515,7 @@ public class QuerySupportImpl implements QuerySupport {
                
                if(subject < 0) {
                        
-                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>() {
-
-                               @Override
-                               public void run(ReadGraphImpl parameter) {
-                               }
-                               
-                       });
+                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, g -> {});
                        
                } else {
                        
@@ -1531,13 +1525,7 @@ public class QuerySupportImpl implements QuerySupport {
                        
                        if(cluster.hasVirtual() && virtualGraphServerSupport.virtuals.contains(subject) && !SessionImplSocket.areVirtualStatementsLoaded(virtualGraphServerSupport, subject, predicate)) {
 
-                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>() {
-
-                                               @Override
-                                               public void run(ReadGraphImpl parameter) {
-                                               }
-                                               
-                                       });
+                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, g -> {});
                                
                                } else {
                                        
@@ -1554,13 +1542,7 @@ public class QuerySupportImpl implements QuerySupport {
                                                
                                        if(cluster.hasVirtual() && virtualGraphServerSupport.virtuals.contains(subject) && !SessionImplSocket.areVirtualStatementsLoaded(virtualGraphServerSupport, subject, predicate)) {
 
-                                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, new Callback<ReadGraphImpl>() {
-
-                                                               @Override
-                                                               public void run(ReadGraphImpl parameter) {
-                                                               }
-                                                               
-                                                       });
+                                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, predicate, g -> {});
                                                
                                                } else {
                                                        
@@ -1582,13 +1564,7 @@ public class QuerySupportImpl implements QuerySupport {
                
                if(subject < 0) {
                        
-                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>() {
-
-                               @Override
-                               public void run(ReadGraphImpl parameter) {
-                               }
-                               
-                       });
+                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, g -> {});
                        
                } else {
                        
@@ -1598,13 +1574,7 @@ public class QuerySupportImpl implements QuerySupport {
                        
                        if(cluster.hasVirtual() && virtualGraphServerSupport.virtuals.contains(subject) && !SessionImplSocket.areVirtualStatementsLoaded(virtualGraphServerSupport, subject)) {
 
-                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>() {
-
-                                               @Override
-                                               public void run(ReadGraphImpl parameter) {
-                                               }
-                                               
-                                       });
+                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, g -> {});
                                
                                } else {
                                        
@@ -1622,13 +1592,7 @@ public class QuerySupportImpl implements QuerySupport {
                                                
                                        if(cluster.hasVirtual() && virtualGraphServerSupport.virtuals.contains(subject) && !SessionImplSocket.areVirtualStatementsLoaded(virtualGraphServerSupport, subject)) {
 
-                                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, new Callback<ReadGraphImpl>() {
-
-                                                               @Override
-                                                               public void run(ReadGraphImpl parameter) {
-                                                               }
-                                                               
-                                                       });
+                                                       SessionImplSocket.loadVirtualStatements(virtualGraphServerSupport, graph, subject, g -> {});
                                                
                                                } else {