refactor: Use functional interfaces in JdbcClient

Change-Id: I8e378bdda6ed9c5528a49fcf453a8c027b44f976

2 files changed, 16 insertions, 18 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/KeyValueModule.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/KeyValueModule.java
index 2bc50c3a46b..9243e24ead8 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/KeyValueModule.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/branch/KeyValueModule.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.osee.orcs.db.internal.branch;
 
+import java.util.function.Consumer;
 import org.apache.commons.lang.mutable.MutableLong;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.jdbc.JdbcClient;
-import org.eclipse.osee.jdbc.JdbcProcessor;
 import org.eclipse.osee.jdbc.JdbcStatement;
 import org.eclipse.osee.orcs.core.ds.KeyValueStore;
 
@@ -52,10 +52,10 @@ public class KeyValueModule {
          public String getByKey(Long key) {
             final MutableString toReturn = new MutableString();
 
-            jdbcClient.runQuery(new JdbcProcessor() {
+            jdbcClient.runQuery(new Consumer<JdbcStatement>() {
 
                @Override
-               public void processNext(JdbcStatement chStmt) {
+               public void accept(JdbcStatement chStmt) {
                   toReturn.setValue(chStmt.getString("value"));
                }
 
@@ -66,10 +66,10 @@ public class KeyValueModule {
          @Override
          public Long getByValue(String value) {
             final MutableLong toReturn = new MutableLong(0);
-            jdbcClient.runQuery(new JdbcProcessor() {
+            jdbcClient.runQuery(new Consumer<JdbcStatement>() {
 
                @Override
-               public void processNext(JdbcStatement chStmt) {
+               public void accept(JdbcStatement chStmt) {
                   toReturn.setValue(chStmt.getLong("key"));
                }
 
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/join/JoinCleanerCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/join/JoinCleanerCallable.java
index 4ecb88a82bb..89f8bdf0888 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/join/JoinCleanerCallable.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/join/JoinCleanerCallable.java
@@ -19,15 +19,15 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 import org.eclipse.osee.executor.admin.CancellableCallable;
 import org.eclipse.osee.jdbc.JdbcClient;
-import org.eclipse.osee.jdbc.JdbcProcessor;
 import org.eclipse.osee.jdbc.JdbcStatement;
 import org.eclipse.osee.logger.Log;
 
 /**
  * If -1 is found in the expires_in column, it means never expire.
- * 
+ *
  * @author Roberto E. Escobar
  */
 public class JoinCleanerCallable extends CancellableCallable<Void> {
@@ -51,19 +51,17 @@ public class JoinCleanerCallable extends CancellableCallable<Void> {
    public Void call() throws Exception {
       try {
          final ListMultimap<String, Object[]> expiredItems = newListMultimap();
-         jdbcClient.runQuery(new JdbcProcessor() {
 
-            @Override
-            public void processNext(JdbcStatement chStmt) {
-               Long issuedAt = chStmt.getLong("issued_at");
-               Long expiresIn = chStmt.getLong("expires_in");
-               if (isExpired(issuedAt, expiresIn)) {
-                  String tableName = chStmt.getString("table_name");
-                  Integer queryId = chStmt.getInt("query_id");
-                  expiredItems.put(tableName, new Integer[] {queryId});
-               }
+         Consumer<JdbcStatement> consumer = stmt -> {
+            Long issuedAt = stmt.getLong("issued_at");
+            Long expiresIn = stmt.getLong("expires_in");
+            if (isExpired(issuedAt, expiresIn)) {
+               String tableName = stmt.getString("table_name");
+               Integer queryId = stmt.getInt("query_id");
+               expiredItems.put(tableName, new Integer[] {queryId});
             }
-         }, SELECT_FROM_JOIN_CLEANUP);
+         };
+         jdbcClient.runQuery(consumer, SELECT_FROM_JOIN_CLEANUP);
 
          if (!expiredItems.isEmpty()) {
             for (Entry<String, Collection<Object[]>> entry : expiredItems.asMap().entrySet()) {