From cb33472dc5e6887530a347bbd66254642be36b0e Mon Sep 17 00:00:00 2001
From: Stepan Usatiuk <stepan@usatiuk.com>
Date: Sat, 10 May 2025 11:07:40 +0200
Subject: [PATCH] Utils: remove VoidFn

---
 .../objects/transaction/TransactionManager.java   | 15 +++++++--------
 .../src/main/java/com/usatiuk/utils/VoidFn.java   |  7 -------
 .../main/java/com/usatiuk/utils/VoidFnThrows.java |  7 -------
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
 delete mode 100644 dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java

diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
index ace63adf..8a6d2e83 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
@@ -1,6 +1,5 @@
 package com.usatiuk.objects.transaction;
 
-import com.usatiuk.utils.VoidFn;
 import io.quarkus.logging.Log;
 
 import java.util.function.Supplier;
@@ -41,9 +40,9 @@ public interface TransactionManager {
         }
     }
 
-    default TransactionHandle runTries(VoidFn fn, int tries, boolean nest) {
+    default TransactionHandle runTries(Runnable fn, int tries, boolean nest) {
         if (!nest && current() != null) {
-            fn.apply();
+            fn.run();
             return new TransactionHandle() {
                 @Override
                 public void onFlush(Runnable runnable) {
@@ -56,7 +55,7 @@ public interface TransactionManager {
             begin();
             boolean commit = false;
             try {
-                fn.apply();
+                fn.run();
                 commit = true;
                 var ret = commit();
                 return ret;
@@ -80,11 +79,11 @@ public interface TransactionManager {
         return runTries(supplier, tries, false);
     }
 
-    default TransactionHandle runTries(VoidFn fn, int tries) {
+    default TransactionHandle runTries(Runnable fn, int tries) {
         return runTries(fn, tries, false);
     }
 
-    default TransactionHandle run(VoidFn fn, boolean nest) {
+    default TransactionHandle run(Runnable fn, boolean nest) {
         return runTries(fn, 10, nest);
     }
 
@@ -92,7 +91,7 @@ public interface TransactionManager {
         return runTries(supplier, 10, nest);
     }
 
-    default TransactionHandle run(VoidFn fn) {
+    default TransactionHandle run(Runnable fn) {
         return run(fn, false);
     }
 
@@ -100,7 +99,7 @@ public interface TransactionManager {
         return run(supplier, false);
     }
 
-    default void executeTx(VoidFn fn) {
+    default void executeTx(Runnable fn) {
         run(fn, false);
     }
 
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
deleted file mode 100644
index 46f4ff0c..00000000
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.usatiuk.utils;
-
-@FunctionalInterface
-public interface VoidFn {
-    void apply();
-}
-
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java
deleted file mode 100644
index ca33ad05..00000000
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.usatiuk.utils;
-
-@FunctionalInterface
-public interface VoidFnThrows {
-    void apply() throws Throwable;
-}
-