From 2623eaa149e07ccb65db43536de98f1b2d7afbe2 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 5 Oct 2018 09:32:01 +0100
Subject: [PATCH] Remove unnecessary throwing variants.

---
 .../bramble/api/db/DatabaseComponent.java      | 17 ++---------------
 .../bramble/db/DatabaseComponentImpl.java      | 18 +++---------------
 .../briar/forum/ForumManagerImpl.java          |  2 +-
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
index 56a3391dd..3fff5f9d6 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
@@ -79,27 +79,14 @@ public interface DatabaseComponent {
 	/**
 	 * Runs the given task within a transaction.
 	 */
-	void transaction(boolean readOnly, DbRunnable<DbException> task)
-			throws DbException;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task.
-	 */
-	<R> R transactionWithResult(boolean readOnly,
-			DbCallable<R, DbException> task) throws DbException;
-
-	/**
-	 * Runs the given task within a transaction.
-	 */
-	<E extends Exception> void throwingTransaction(boolean readOnly,
+	<E extends Exception> void transaction(boolean readOnly,
 			DbRunnable<E> task) throws DbException, E;
 
 	/**
 	 * Runs the given task within a transaction and returns the result of the
 	 * task.
 	 */
-	<R, E extends Exception> R throwingTransactionWithResult(boolean readOnly,
+	<R, E extends Exception> R transactionWithResult(boolean readOnly,
 			DbCallable<R, E> task) throws DbException, E;
 
 	/**
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java
index ad867dfb4..c4b303fbb 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java
@@ -169,19 +169,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	}
 
 	@Override
-	public void transaction(boolean readOnly, DbRunnable<DbException> task)
-			throws DbException {
-		throwingTransaction(readOnly, task);
-	}
-
-	@Override
-	public <R> R transactionWithResult(boolean readOnly,
-			DbCallable<R, DbException> task) throws DbException {
-		return throwingTransactionWithResult(readOnly, task);
-	}
-
-	@Override
-	public <E extends Exception> void throwingTransaction(boolean readOnly,
+	public <E extends Exception> void transaction(boolean readOnly,
 			DbRunnable<E> task) throws DbException, E {
 		final Transaction txn = startTransaction(readOnly);
 		try {
@@ -193,8 +181,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 	}
 
 	@Override
-	public <R, E extends Exception> R throwingTransactionWithResult(
-			boolean readOnly, DbCallable<R, E> task) throws DbException, E {
+	public <R, E extends Exception> R transactionWithResult(boolean readOnly,
+			DbCallable<R, E> task) throws DbException, E {
 		final Transaction txn = startTransaction(readOnly);
 		try {
 			R result = task.call(txn);
diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java
index f2fddf0cf..b60e7c94b 100644
--- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java
@@ -192,7 +192,7 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager {
 	public Collection<ForumPostHeader> getPostHeaders(GroupId g)
 			throws DbException {
 		try {
-			return db.throwingTransactionWithResult(true, txn -> {
+			return db.transactionWithResult(true, txn -> {
 				Collection<ForumPostHeader> headers = new ArrayList<>();
 				Map<MessageId, BdfDictionary> metadata =
 						clientHelper.getMessageMetadataAsDictionary(txn, g);