remove unused methods in DbActions and DbHelper

Author: danthe1st

src/main/java/net/javadiscord/javabot/data/h2db/DbActions.java

@@ -9,9 +9,6 @@
 
 import java.sql.*;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
 
 import javax.sql.DataSource;
 
@@ -22,36 +19,9 @@
 @Service
 @RequiredArgsConstructor
 public class DbActions {
-	private final ExecutorService asyncPool;
 	@Getter
 	private final DataSource dataSource;
 
-	/**
-	 * Consumes an action based on the given {@link ConnectionConsumer}.
-	 *
-	 * @param consumer The {@link ConnectionConsumer}.
-	 * @throws SQLException If an error occurs.
-	 */
-	public void doAction(@NotNull ConnectionConsumer consumer) throws SQLException {
-		try (Connection c = dataSource.getConnection()) {
-			consumer.consume(c);
-		}
-	}
-
-	/**
-	 * Maps an action based on the given {@link ConnectionFunction}.
-	 *
-	 * @param function The {@link ConnectionFunction}.
-	 * @param <T>      The generic type.
-	 * @return A generic type.
-	 * @throws SQLException If an error occurs.
-	 */
-	public <T> T map(@NotNull ConnectionFunction<T> function) throws SQLException {
-		try (Connection c = dataSource.getConnection()) {
-			return function.apply(c);
-		}
-	}
-
 	/**
 	 * Maps a query.
 	 *
@@ -70,28 +40,6 @@ public <T> T mapQuery(@NotNull String query, @NotNull StatementModifier modifier
 		}
 	}
 
-	/**
-	 * Maps a query asynchronous.
-	 *
-	 * @param query    The query.
-	 * @param modifier The {@link StatementModifier}.
-	 * @param mapper   The {@link ResultSetMapper}.
-	 * @param <T>      The generic type.
-	 * @return A generic type.
-	 */
-	public <T> @NotNull CompletableFuture<T> mapQueryAsync(@NotNull String query, @NotNull StatementModifier modifier, @NotNull ResultSetMapper<T> mapper) {
-		CompletableFuture<T> cf = new CompletableFuture<>();
-		asyncPool.submit(() -> {
-			try {
-				cf.complete(mapQuery(query, modifier, mapper));
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbActions.class.getSimpleName());
-				cf.completeExceptionally(e);
-			}
-		});
-		return cf;
-	}
-
 	/**
 	 * Gets a count, using a query which <strong>must</strong> return a long
 	 * integer value as the first column of the result set.
@@ -133,23 +81,6 @@ public long count(@NotNull String query) {
 		}
 	}
 
-	/**
-	 * Convenience method similar to {@link DbActions#count(String, StatementModifier)}
-	 * which allows for getting the count from a query using simple string
-	 * formatting instead of having to define a statement modifier.
-	 * <p>
-	 * <strong>WARNING</strong>: This method should NEVER be called with
-	 * user-provided data.
-	 * </p>
-	 *
-	 * @param queryFormat The format string.
-	 * @param args        The set of arguments to pass to the formatter.
-	 * @return The count.
-	 */
-	public long countf(@NotNull String queryFormat, @NotNull Object... args) {
-		return count(String.format(queryFormat, args));
-	}
-
 	/**
 	 * Updates a database table.
 	 *
@@ -168,71 +99,6 @@ public int update(@NotNull String query, Object @NotNull ... params) throws SQLE
 		}
 	}
 
-	/**
-	 * Does an asynchronous database action using the bot's async pool.
-	 *
-	 * @param consumer The consumer that will use a connection.
-	 * @return A future that completes when the action is complete.
-	 */
-	public @NotNull CompletableFuture<Void> doAsyncAction(ConnectionConsumer consumer) {
-		CompletableFuture<Void> future = new CompletableFuture<>();
-		asyncPool.submit(() -> {
-			try (Connection c = dataSource.getConnection()) {
-				consumer.consume(c);
-				future.complete(null);
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbActions.class.getSimpleName());
-				future.completeExceptionally(e);
-			}
-		});
-		return future;
-	}
-
-	/**
-	 * Does an asynchronous database action using the bot's async pool, and
-	 * wraps access to the connection behind a data access object that can be
-	 * built using the provided dao constructor.
-	 *
-	 * @param daoConstructor A function to build a DAO using a connection.
-	 * @param consumer       The consumer that does something with the DAO.
-	 * @param <T>            The type of data access object. Usually some kind of repository.
-	 * @return A future that completes when the action is complete.
-	 */
-	public <T> @NotNull CompletableFuture<Void> doAsyncDaoAction(Function<Connection, T> daoConstructor, DaoConsumer<T> consumer) {
-		CompletableFuture<Void> future = new CompletableFuture<>();
-		asyncPool.submit(() -> {
-			try (Connection c = dataSource.getConnection()) {
-				T dao = daoConstructor.apply(c);
-				consumer.consume(dao);
-				future.complete(null);
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbActions.class.getSimpleName());
-				future.completeExceptionally(e);
-			}
-		});
-		return future;
-	}
-
-	/**
-	 * Maps a {@link ConnectionFunction} asynchronous.
-	 *
-	 * @param function The {@link ConnectionFunction}.
-	 * @param <T>      The generic type.
-	 * @return A generic type.
-	 */
-	public <T> @NotNull CompletableFuture<T> mapAsync(ConnectionFunction<T> function) {
-		CompletableFuture<T> future = new CompletableFuture<>();
-		asyncPool.submit(() -> {
-			try (Connection c = dataSource.getConnection()) {
-				future.complete(function.apply(c));
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbActions.class.getSimpleName());
-				future.completeExceptionally(e);
-			}
-		});
-		return future;
-	}
-
 	/**
 	 * Fetches a single result from the database.
 	 *

src/main/java/net/javadiscord/javabot/data/h2db/DbHelper.java

@@ -23,8 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -86,54 +84,6 @@ public class DbHelper {
 		return ds;
 	}
 
-	/**
-	 * Does an asynchronous database action using the bot's async pool.
-	 *
-	 * @param consumer The consumer that will use a connection.
-	 */
-	public void doDbAction(ConnectionConsumer consumer) {
-		asyncPool.submit(() -> {
-			try (Connection c = dataSource.getConnection()) {
-				consumer.consume(c);
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbHelper.class.getSimpleName());
-			}
-		});
-	}
-
-	/**
-	 * Does an asynchronous database action using the bot's async pool, and
-	 * wraps access to the connection behind a data access object that can be
-	 * built using the provided dao constructor.
-	 *
-	 * @param daoConstructor A function to build a DAO using a connection.
-	 * @param consumer       The consumer that does something with the DAO.
-	 * @param <T>            The type of data access object. Usually some kind of repository.
-	 */
-	public <T> void doDaoAction(Function<Connection, T> daoConstructor, DaoConsumer<T> consumer) {
-		doDaoAction((con,conf)->daoConstructor.apply(con), consumer);
-	}
-
-	/**
-	 * Does an asynchronous database action using the bot's async pool, and
-	 * wraps access to the connection behind a data access object that can be
-	 * built using the provided dao constructor.
-	 *
-	 * @param daoConstructor A function to build a DAO using a connection.
-	 * @param consumer       The consumer that does something with the DAO.
-	 * @param <T>            The type of data access object. Usually some kind of repository.
-	 */
-	public <T> void doDaoAction(BiFunction<Connection, BotConfig, T> daoConstructor, DaoConsumer<T> consumer) {
-		asyncPool.submit(() -> {
-			try (Connection c = dataSource.getConnection()) {
-				T dao = daoConstructor.apply(c, botConfig);
-				consumer.consume(dao);
-			} catch (SQLException e) {
-				ExceptionLogger.capture(e, DbHelper.class.getSimpleName());
-			}
-		});
-	}
-
 	private static boolean shouldInitSchema(String jdbcUrl) {
 		Pattern p = Pattern.compile("jdbc:h2:tcp://localhost:\\d+/(.*)");
 		Matcher m = p.matcher(jdbcUrl);