Merge branch 'use-java-8-language-features' into 'master'

Use java 8 language features

See merge request !621

bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java

@@ -45,7 +45,7 @@ public class AndroidPluginModule {
 				backoffFactory);
 		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
 				backoffFactory, appContext);
-		final Collection<DuplexPluginFactory> duplex =
+		Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, tor, lan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java

@@ -124,12 +124,7 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		// with a message queue, so submit it to the AndroidExecutor
 		try {
 			adapter = androidExecutor.runOnBackgroundThread(
-					new Callable<BluetoothAdapter>() {
+					BluetoothAdapter::getDefaultAdapter).get();
-						@Override
-						public BluetoothAdapter call() throws Exception {
-							return BluetoothAdapter.getDefaultAdapter();
-						}
-					}).get();
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			LOG.warning("Interrupted while getting BluetoothAdapter");
@@ -162,40 +157,36 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			if (!isRunning()) return;
-			public void run() {
+			String address = AndroidUtils.getBluetoothAddress(appContext,
-				if (!isRunning()) return;
+					adapter);
-				String address = AndroidUtils.getBluetoothAddress(appContext,
+			if (LOG.isLoggable(INFO))
-						adapter);
+				LOG.info("Local address " + scrubMacAddress(address));
-				if (LOG.isLoggable(INFO))
+			if (!StringUtils.isNullOrEmpty(address)) {
-					LOG.info("Local address " + scrubMacAddress(address));
+				// Advertise the Bluetooth address to contacts
-				if (!StringUtils.isNullOrEmpty(address)) {
+				TransportProperties p = new TransportProperties();
-					// Advertise the Bluetooth address to contacts
+				p.put(PROP_ADDRESS, address);
-					TransportProperties p = new TransportProperties();
+				callback.mergeLocalProperties(p);
-					p.put(PROP_ADDRESS, address);
-					callback.mergeLocalProperties(p);
-				}
-				// Bind a server socket to accept connections from contacts
-				BluetoothServerSocket ss;
-				try {
-					ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-							"RFCOMM", getUuid());
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					return;
-				}
-				if (!isRunning()) {
-					tryToClose(ss);
-					return;
-				}
-				LOG.info("Socket bound");
-				socket = ss;
-				backoff.reset();
-				callback.transportEnabled();
-				acceptContactConnections();
 			}
+			// Bind a server socket to accept connections from contacts
+			BluetoothServerSocket ss;
+			try {
+				ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
+						"RFCOMM", getUuid());
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				return;
+			}
+			if (!isRunning()) {
+				tryToClose(ss);
+				return;
+			}
+			LOG.info("Socket bound");
+			socket = ss;
+			backoff.reset();
+			callback.transportEnabled();
+			acceptContactConnections();
 		});
 	}
 
@@ -294,21 +285,18 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
-			final ContactId c = e.getKey();
+			ContactId c = e.getKey();
 			if (connected.contains(c)) continue;
-			final String address = e.getValue().get(PROP_ADDRESS);
+			String address = e.getValue().get(PROP_ADDRESS);
 			if (StringUtils.isNullOrEmpty(address)) continue;
-			final String uuid = e.getValue().get(PROP_UUID);
+			String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(() -> {
-				@Override
+				if (!running) return;
-				public void run() {
+				BluetoothSocket s = connect(address, uuid);
-					if (!running) return;
+				if (s != null) {
-					BluetoothSocket s = connect(address, uuid);
+					backoff.reset();
-					if (s != null) {
+					callback.outgoingConnectionCreated(c, wrapSocket(s));
-						backoff.reset();
-						callback.outgoingConnectionCreated(c, wrapSocket(s));
-					}
 				}
 			});
 		}
@@ -438,21 +426,11 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	}
 
 	private void enableAdapterAsync() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(this::enableAdapter);
-			@Override
-			public void run() {
-				enableAdapter();
-			}
-		});
 	}
 
 	private void disableAdapterAsync() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(this::disableAdapter);
-			@Override
-			public void run() {
-				disableAdapter();
-			}
-		});
 	}
 
 	private class BluetoothStateReceiver extends BroadcastReceiver {
@@ -490,16 +468,13 @@ class DroidtoothPlugin implements DuplexPlugin, EventListener {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
+				BluetoothSocket s = ss.accept();
-				public KeyAgreementConnection call() throws IOException {
+				if (LOG.isLoggable(INFO))
-					BluetoothSocket s = ss.accept();
+					LOG.info(ID.getString() + ": Incoming connection");
-					if (LOG.isLoggable(INFO))
+				return new KeyAgreementConnection(
-						LOG.info(ID.getString() + ": Incoming connection");
+						new DroidtoothTransportConnection(
-					return new KeyAgreementConnection(
+								DroidtoothPlugin.this, s), ID);
-							new DroidtoothTransportConnection(
-									DroidtoothPlugin.this, s), ID);
-				}
 			};
 		}
 

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -370,57 +370,45 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void sendDevReports() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			// TODO: Trigger this with a TransportEnabledEvent
-			public void run() {
+			File reportDir = AndroidUtils.getReportDir(appContext);
-				// TODO: Trigger this with a TransportEnabledEvent
+			reporter.sendReports(reportDir);
-				File reportDir = AndroidUtils.getReportDir(appContext);
-				reporter.sendReports(reportDir);
-			}
 		});
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			// If there's already a port number stored in config, reuse it
-			public void run() {
+			String portString = callback.getSettings().get(PREF_TOR_PORT);
-				// If there's already a port number stored in config, reuse it
+			int port;
-				String portString = callback.getSettings().get(PREF_TOR_PORT);
+			if (StringUtils.isNullOrEmpty(portString)) port = 0;
-				int port;
+			else port = Integer.parseInt(portString);
-				if (StringUtils.isNullOrEmpty(portString)) port = 0;
+			// Bind a server socket to receive connections from Tor
-				else port = Integer.parseInt(portString);
+			ServerSocket ss = null;
-				// Bind a server socket to receive connections from Tor
+			try {
-				ServerSocket ss = null;
+				ss = new ServerSocket();
-				try {
+				ss.bind(new InetSocketAddress("127.0.0.1", port));
-					ss = new ServerSocket();
+			} catch (IOException e) {
-					ss.bind(new InetSocketAddress("127.0.0.1", port));
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (IOException e) {
+				tryToClose(ss);
-					if (LOG.isLoggable(WARNING))
+				return;
-						LOG.log(WARNING, e.toString(), e);
-					tryToClose(ss);
-					return;
-				}
-				if (!running) {
-					tryToClose(ss);
-					return;
-				}
-				socket = ss;
-				// Store the port number
-				final String localPort = String.valueOf(ss.getLocalPort());
-				Settings s = new Settings();
-				s.put(PREF_TOR_PORT, localPort);
-				callback.mergeSettings(s);
-				// Create a hidden service if necessary
-				ioExecutor.execute(new Runnable() {
-					@Override
-					public void run() {
-						publishHiddenService(localPort);
-					}
-				});
-				backoff.reset();
-				// Accept incoming hidden service connections from Tor
-				acceptContactConnections(ss);
 			}
+			if (!running) {
+				tryToClose(ss);
+				return;
+			}
+			socket = ss;
+			// Store the port number
+			String localPort = String.valueOf(ss.getLocalPort());
+			Settings s = new Settings();
+			s.put(PREF_TOR_PORT, localPort);
+			callback.mergeSettings(s);
+			// Create a hidden service if necessary
+			ioExecutor.execute(() -> publishHiddenService(localPort));
+			backoff.reset();
+			// Accept incoming hidden service connections from Tor
+			acceptContactConnections(ss);
 		});
 	}
 
@@ -548,17 +536,13 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void connectAndCallBack(final ContactId c,
+	private void connectAndCallBack(ContactId c, TransportProperties p) {
-			final TransportProperties p) {
+		ioExecutor.execute(() -> {
-		ioExecutor.execute(new Runnable() {
+			if (!isRunning()) return;
-			@Override
+			DuplexTransportConnection d = createConnection(p);
-			public void run() {
+			if (d != null) {
-				if (!isRunning()) return;
+				backoff.reset();
-				DuplexTransportConnection d = createConnection(p);
+				callback.outgoingConnectionCreated(c, d);
-				if (d != null) {
-					backoff.reset();
-					callback.outgoingConnectionCreated(c, d);
-				}
 			}
 		});
 	}
@@ -691,48 +675,43 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void updateConnectionStatus() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			if (!running) return;
-			public void run() {
-				if (!running) return;
 
-				Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
+			Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
-				ConnectivityManager cm = (ConnectivityManager) o;
+			ConnectivityManager cm = (ConnectivityManager) o;
-				NetworkInfo net = cm.getActiveNetworkInfo();
+			NetworkInfo net = cm.getActiveNetworkInfo();
-				boolean online = net != null && net.isConnected();
+			boolean online = net != null && net.isConnected();
-				boolean wifi = online && net.getType() == TYPE_WIFI;
+			boolean wifi = online && net.getType() == TYPE_WIFI;
-				String country = locationUtils.getCurrentCountry();
+			String country = locationUtils.getCurrentCountry();
-				boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
+			boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
-						country);
+					country);
-				Settings s = callback.getSettings();
+			Settings s = callback.getSettings();
-				int network = s.getInt(PREF_TOR_NETWORK,
+			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-						PREF_TOR_NETWORK_ALWAYS);
 
-				if (LOG.isLoggable(INFO)) {
+			if (LOG.isLoggable(INFO)) {
-					LOG.info("Online: " + online + ", wifi: " + wifi);
+				LOG.info("Online: " + online + ", wifi: " + wifi);
-					if ("".equals(country)) LOG.info("Country code unknown");
+				if ("".equals(country)) LOG.info("Country code unknown");
-					else LOG.info("Country code: " + country);
+				else LOG.info("Country code: " + country);
-				}
+			}
-
+
-				try {
+			try {
-					if (!online) {
+				if (!online) {
-						LOG.info("Disabling network, device is offline");
+					LOG.info("Disabling network, device is offline");
-						enableNetwork(false);
+					enableNetwork(false);
-					} else if (blocked) {
+				} else if (blocked) {
-						LOG.info("Disabling network, country is blocked");
+					LOG.info("Disabling network, country is blocked");
-						enableNetwork(false);
+					enableNetwork(false);
-					} else if (network == PREF_TOR_NETWORK_NEVER
+				} else if (network == PREF_TOR_NETWORK_NEVER
-							|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
+						|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
-						LOG.info("Disabling network due to data setting");
+					LOG.info("Disabling network due to data setting");
-						enableNetwork(false);
+					enableNetwork(false);
-					} else {
+				} else {
-						LOG.info("Enabling network");
+					LOG.info("Enabling network");
-						enableNetwork(true);
+					enableNetwork(true);
-					}
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
 				}
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		});
 	}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidExecutorImpl.java

@@ -27,14 +27,11 @@ class AndroidExecutorImpl implements AndroidExecutor {
 	@Inject
 	AndroidExecutorImpl(Application app) {
 		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
-		loop = new Runnable() {
+		loop = () -> {
-			@Override
+			Looper.prepare();
-			public void run() {
+			backgroundHandler = new Handler();
-				Looper.prepare();
+			startLatch.countDown();
-				backgroundHandler = new Handler();
+			Looper.loop();
-				startLatch.countDown();
-				Looper.loop();
-			}
 		};
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java

@@ -23,7 +23,7 @@ public class BdfMessageContext {
 	}
 
 	public BdfMessageContext(BdfDictionary dictionary) {
-		this(dictionary, Collections.<MessageId>emptyList());
+		this(dictionary, Collections.emptyList());
 	}
 
 	public BdfDictionary getDictionary() {

bramble-api/src/main/java/org/briarproject/bramble/api/db/Transaction.java

@@ -45,7 +45,7 @@ public class Transaction {
 	 * committed.
 	 */
 	public void attach(Event e) {
-		if (events == null) events = new ArrayList<Event>();
+		if (events == null) events = new ArrayList<>();
 		events.add(e);
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageContext.java

@@ -22,7 +22,7 @@ public class MessageContext {
 	}
 
 	public MessageContext(Metadata metadata) {
-		this(metadata, Collections.<MessageId>emptyList());
+		this(metadata, Collections.emptyList());
 	}
 
 	public Metadata getMetadata() {

bramble-api/src/test/java/org/briarproject/bramble/test/BrambleTestCase.java

@@ -8,12 +8,9 @@ public abstract class BrambleTestCase {
 
 	public BrambleTestCase() {
 		// Ensure exceptions thrown on worker threads cause tests to fail
-		UncaughtExceptionHandler fail = new UncaughtExceptionHandler() {
+		UncaughtExceptionHandler fail = (thread, throwable) -> {
-			@Override
+			throwable.printStackTrace();
-			public void uncaughtException(Thread thread, Throwable throwable) {
+			fail();
-				throwable.printStackTrace();
-				fail();
-			}
 		};
 		Thread.setDefaultUncaughtExceptionHandler(fail);
 	}

bramble-core/src/main/java/org/briarproject/bramble/PoliteExecutor.java

@@ -24,7 +24,7 @@ public class PoliteExecutor implements Executor {
 
 	private final Object lock = new Object();
 	@GuardedBy("lock")
-	private final Queue<Runnable> queue = new LinkedList<Runnable>();
+	private final Queue<Runnable> queue = new LinkedList<>();
 	private final Executor delegate;
 	private final int maxConcurrentTasks;
 	private final Logger log;
@@ -48,20 +48,17 @@ public class PoliteExecutor implements Executor {
 	}
 
 	@Override
-	public void execute(final Runnable r) {
+	public void execute(Runnable r) {
-		final long submitted = System.currentTimeMillis();
+		long submitted = System.currentTimeMillis();
-		Runnable wrapped = new Runnable() {
+		Runnable wrapped = () -> {
-			@Override
+			if (log.isLoggable(LOG_LEVEL)) {
-			public void run() {
+				long queued = System.currentTimeMillis() - submitted;
-				if (log.isLoggable(LOG_LEVEL)) {
+				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
-					long queued = System.currentTimeMillis() - submitted;
+			}
-					log.log(LOG_LEVEL, "Queue time " + queued + " ms");
+			try {
-				}
+				r.run();
-				try {
+			} finally {
-					r.run();
+				scheduleNext();
-				} finally {
-					scheduleNext();
-				}
 			}
 		};
 		synchronized (lock) {

bramble-core/src/main/java/org/briarproject/bramble/TimeLoggingExecutor.java

@@ -28,19 +28,16 @@ public class TimeLoggingExecutor extends ThreadPoolExecutor {
 	}
 
 	@Override
-	public void execute(final Runnable r) {
+	public void execute(Runnable r) {
 		if (log.isLoggable(LOG_LEVEL)) {
-			final long submitted = System.currentTimeMillis();
+			long submitted = System.currentTimeMillis();
-			super.execute(new Runnable() {
+			super.execute(() -> {
-				@Override
+				long started = System.currentTimeMillis();
-				public void run() {
+				long queued = started - submitted;
-					long started = System.currentTimeMillis();
+				log.log(LOG_LEVEL, "Queue time " + queued + " ms");
-					long queued = started - submitted;
+				r.run();
-					log.log(LOG_LEVEL, "Queue time " + queued + " ms");
+				long executing = System.currentTimeMillis() - started;
-					r.run();
+				log.log(LOG_LEVEL, "Execution time " + executing + " ms");
-					long executing = System.currentTimeMillis() - started;
-					log.log(LOG_LEVEL, "Execution time " + executing + " ms");
-				}
 			});
 		} else {
 			super.execute(r);

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -201,8 +201,7 @@ class ClientHelperImpl implements ClientHelper {
 	public Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
 			Transaction txn, GroupId g) throws DbException, FormatException {
 		Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g);
-		Map<MessageId, BdfDictionary> parsed =
+		Map<MessageId, BdfDictionary> parsed = new HashMap<>(raw.size());
-				new HashMap<MessageId, BdfDictionary>(raw.size());
 		for (Entry<MessageId, Metadata> e : raw.entrySet())
 			parsed.put(e.getKey(), metadataParser.parse(e.getValue()));
 		return parsed;
@@ -229,8 +228,7 @@ class ClientHelperImpl implements ClientHelper {
 			FormatException {
 		Metadata metadata = metadataEncoder.encode(query);
 		Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g, metadata);
-		Map<MessageId, BdfDictionary> parsed =
+		Map<MessageId, BdfDictionary> parsed = new HashMap<>(raw.size());
-				new HashMap<MessageId, BdfDictionary>(raw.size());
 		for (Entry<MessageId, Metadata> e : raw.entrySet())
 			parsed.put(e.getKey(), metadataParser.parse(e.getValue()));
 		return parsed;

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java

@@ -184,12 +184,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 			// Close the outgoing stream and expect EOF on the incoming stream
 			w.close();
 			if (!r.eof()) LOG.warning("Unexpected data at end of connection");
-		} catch (GeneralSecurityException e) {
+		} catch (GeneralSecurityException | IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			listener.contactExchangeFailed();
-			tryToClose(conn, true);
-			return;
-		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			listener.contactExchangeFailed();
 			tryToClose(conn, true);
@@ -276,8 +271,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 
 	private Map<TransportId, TransportProperties> receiveTransportProperties(
 			BdfReader r) throws IOException {
-		Map<TransportId, TransportProperties> remote =
+		Map<TransportId, TransportProperties> remote = new HashMap<>();
-				new HashMap<TransportId, TransportProperties>();
 		r.readListStart();
 		while (!r.hasListEnd()) {
 			r.readListStart();

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java

@@ -34,8 +34,8 @@ class ContactManagerImpl implements ContactManager {
 	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager) {
 		this.db = db;
 		this.keyManager = keyManager;
-		addHooks = new CopyOnWriteArrayList<AddContactHook>();
+		addHooks = new CopyOnWriteArrayList<>();
-		removeHooks = new CopyOnWriteArrayList<RemoveContactHook>();
+		removeHooks = new CopyOnWriteArrayList<>();
 	}
 
 	@Override
@@ -125,7 +125,7 @@ class ContactManagerImpl implements ContactManager {
 		} finally {
 			db.endTransaction(txn);
 		}
-		List<Contact> active = new ArrayList<Contact>(contacts.size());
+		List<Contact> active = new ArrayList<>(contacts.size());
 		for (Contact c : contacts) if (c.isActive()) active.add(c);
 		return active;
 	}

bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java

@@ -602,8 +602,8 @@ class CryptoComponentImpl implements CryptoComponent {
 
 	// Package access for testing
 	int chooseIterationCount(int targetMillis) {
-		List<Long> quickSamples = new ArrayList<Long>(PBKDF_SAMPLES);
+		List<Long> quickSamples = new ArrayList<>(PBKDF_SAMPLES);
-		List<Long> slowSamples = new ArrayList<Long>(PBKDF_SAMPLES);
+		List<Long> slowSamples = new ArrayList<>(PBKDF_SAMPLES);
 		long iterationNanos = 0, initNanos = 0;
 		while (iterationNanos <= 0 || initNanos <= 0) {
 			// Sample the running time with one iteration and two iterations

bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java

@@ -48,7 +48,7 @@ public class CryptoModule {
 
 	public CryptoModule() {
 		// Use an unbounded queue
-		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
+		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordStrengthEstimatorImpl.java

@@ -16,7 +16,7 @@ class PasswordStrengthEstimatorImpl implements PasswordStrengthEstimator {
 
 	@Override
 	public float estimateStrength(String password) {
-		HashSet<Character> unique = new HashSet<Character>();
+		HashSet<Character> unique = new HashSet<>();
 		int length = password.length();
 		for (int i = 0; i < length; i++) unique.add(password.charAt(i));
 		return Math.min(1, (float) unique.size() / STRONG_UNIQUE_CHARS);

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -103,15 +103,11 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 
 	@Override
 	public boolean open() throws DbException {
-		Runnable shutdownHook = new Runnable() {
+		Runnable shutdownHook = () -> {
-			@Override
+			try {
-			public void run() {
+				close();
-				try {
+			} catch (DbException e) {
-					close();
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		};
 		boolean reopened = db.open();
@@ -141,11 +137,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		}
 		try {
 			return new Transaction(db.startTransaction(), readOnly);
-		} catch (DbException e) {
+		} catch (DbException | RuntimeException e) {
-			if (readOnly) lock.readLock().unlock();
-			else lock.writeLock().unlock();
-			throw e;
-		} catch (RuntimeException e) {
 			if (readOnly) lock.readLock().unlock();
 			else lock.writeLock().unlock();
 			throw e;
@@ -331,7 +323,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
 		Collection<MessageId> ids = db.getMessagesToSend(txn, c, maxLength);
-		List<byte[]> messages = new ArrayList<byte[]>(ids.size());
+		List<byte[]> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
 			messages.add(db.getRawMessage(txn, m));
 			db.updateExpiryTime(txn, c, m, maxLatency);
@@ -381,7 +373,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			throw new NoSuchContactException();
 		Collection<MessageId> ids = db.getRequestedMessagesToSend(txn, c,
 				maxLength);
-		List<byte[]> messages = new ArrayList<byte[]>(ids.size());
+		List<byte[]> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
 			messages.add(db.getRawMessage(txn, m));
 			db.updateExpiryTime(txn, c, m, maxLatency);
@@ -661,7 +653,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		Collection<MessageId> acked = new ArrayList<MessageId>();
+		Collection<MessageId> acked = new ArrayList<>();
 		for (MessageId m : a.getMessageIds()) {
 			if (db.containsVisibleMessage(txn, c, m)) {
 				db.raiseSeenFlag(txn, c, m);
@@ -896,8 +888,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			Map<ContactId, TransportKeys> keys) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
-		Map<ContactId, TransportKeys> filtered =
+		Map<ContactId, TransportKeys> filtered = new HashMap<>();
-				new HashMap<ContactId, TransportKeys>();
 		for (Entry<ContactId, TransportKeys> e : keys.entrySet()) {
 			ContactId c = e.getKey();
 			TransportKeys k = e.getValue();

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseExecutorModule.java

@@ -32,7 +32,7 @@ public class DatabaseExecutorModule {
 
 	public DatabaseExecutorModule() {
 		// Use an unbounded queue
-		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
+		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseModule.java

@@ -26,7 +26,7 @@ public class DatabaseModule {
 	@Singleton
 	DatabaseComponent provideDatabaseComponent(Database<Connection> db,
 			EventBus eventBus, ShutdownManager shutdown) {
-		return new DatabaseComponentImpl<Connection>(db, Connection.class,
+		return new DatabaseComponentImpl<>(db, Connection.class, eventBus,
-				eventBus, shutdown);
+				shutdown);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -263,8 +263,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private final String hashType, binaryType, counterType, secretType;
 	private final Clock clock;
 
-	private final LinkedList<Connection> connections =
+	// Locking: connectionsLock
-			new LinkedList<Connection>(); // Locking: connectionsLock
+	private final LinkedList<Connection> connections = new LinkedList<>();
 
 	private int openConnections = 0; // Locking: connectionsLock
 	private boolean closed = false; // Locking: connectionsLock
@@ -1035,7 +1035,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " FROM contacts";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
-			List<Contact> contacts = new ArrayList<Contact>();
+			List<Contact> contacts = new ArrayList<>();
 			while (rs.next()) {
 				ContactId contactId = new ContactId(rs.getInt(1));
 				AuthorId authorId = new AuthorId(rs.getBytes(2));
@@ -1069,7 +1069,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, local.getBytes());
 			rs = ps.executeQuery();
-			List<ContactId> ids = new ArrayList<ContactId>();
+			List<ContactId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new ContactId(rs.getInt(1)));
 			rs.close();
 			ps.close();
@@ -1094,7 +1094,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, remote.getBytes());
 			rs = ps.executeQuery();
-			List<Contact> contacts = new ArrayList<Contact>();
+			List<Contact> contacts = new ArrayList<>();
 			while (rs.next()) {
 				ContactId c = new ContactId(rs.getInt(1));
 				String name = rs.getString(2);
@@ -1150,7 +1150,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, c.getString());
 			rs = ps.executeQuery();
-			List<Group> groups = new ArrayList<Group>();
+			List<Group> groups = new ArrayList<>();
 			while (rs.next()) {
 				GroupId id = new GroupId(rs.getBytes(1));
 				byte[] descriptor = rs.getBytes(2);
@@ -1203,7 +1203,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, g.getBytes());
 			rs = ps.executeQuery();
-			List<ContactId> visible = new ArrayList<ContactId>();
+			List<ContactId> visible = new ArrayList<>();
 			while (rs.next()) visible.add(new ContactId(rs.getInt(1)));
 			rs.close();
 			ps.close();
@@ -1255,7 +1255,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " FROM localAuthors";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
-			List<LocalAuthor> authors = new ArrayList<LocalAuthor>();
+			List<LocalAuthor> authors = new ArrayList<>();
 			while (rs.next()) {
 				AuthorId authorId = new AuthorId(rs.getBytes(1));
 				String name = rs.getString(2);
@@ -1285,7 +1285,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, g.getBytes());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1308,7 +1308,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, state.getValue());
 			ps.setBytes(2, g.getBytes());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1343,7 +1343,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ps.setString(3, e.getKey());
 				ps.setBytes(4, e.getValue());
 				rs = ps.executeQuery();
-				Set<MessageId> ids = new HashSet<MessageId>();
+				Set<MessageId> ids = new HashSet<>();
 				while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 				rs.close();
 				ps.close();
@@ -1377,7 +1377,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, DELIVERED.getValue());
 			ps.setBytes(2, g.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>();
+			Map<MessageId, Metadata> all = new HashMap<>();
 			Metadata metadata = null;
 			MessageId lastMessageId = null;
 			while (rs.next()) {
@@ -1406,8 +1406,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		Collection<MessageId> matches = getMessageIds(txn, g, query);
 		if (matches.isEmpty()) return Collections.emptyMap();
 		// Retrieve the metadata for each match
-		Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>(
+		Map<MessageId, Metadata> all = new HashMap<>(matches.size());
-				matches.size());
 		for (MessageId m : matches) all.put(m, getMessageMetadata(txn, m));
 		return all;
 	}
@@ -1505,7 +1504,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setBytes(1, g.getBytes());
 			ps.setInt(2, c.getInt());
 			rs = ps.executeQuery();
-			List<MessageStatus> statuses = new ArrayList<MessageStatus>();
+			List<MessageStatus> statuses = new ArrayList<>();
 			while (rs.next()) {
 				MessageId messageId = new MessageId(rs.getBytes(1));
 				boolean sent = rs.getBoolean(2);
@@ -1564,7 +1563,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, State> dependencies = new HashMap<MessageId, State>();
+			Map<MessageId, State> dependencies = new HashMap<>();
 			while (rs.next()) {
 				MessageId dependency = new MessageId(rs.getBytes(1));
 				State state = State.fromValue(rs.getInt(2));
@@ -1602,7 +1601,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			rs = ps.executeQuery();
-			Map<MessageId, State> dependents = new HashMap<MessageId, State>();
+			Map<MessageId, State> dependents = new HashMap<>();
 			while (rs.next()) {
 				MessageId dependent = new MessageId(rs.getBytes(1));
 				State state = State.fromValue(rs.getInt(2));
@@ -1654,7 +1653,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1690,7 +1689,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setLong(3, now);
 			ps.setInt(4, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1715,7 +1714,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, maxMessages);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1750,7 +1749,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
@@ -1792,7 +1791,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(1, state.getValue());
 			ps.setString(2, c.getString());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1822,7 +1821,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, c.getString());
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
 			rs.close();
 			ps.close();
@@ -1881,7 +1880,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
 			rs = ps.executeQuery();
-			List<MessageId> ids = new ArrayList<MessageId>();
+			List<MessageId> ids = new ArrayList<>();
 			int total = 0;
 			while (rs.next()) {
 				int length = rs.getInt(1);
@@ -1935,7 +1934,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, t.getString());
 			rs = ps.executeQuery();
-			List<IncomingKeys> inKeys = new ArrayList<IncomingKeys>();
+			List<IncomingKeys> inKeys = new ArrayList<>();
 			while (rs.next()) {
 				long rotationPeriod = rs.getLong(1);
 				SecretKey tagKey = new SecretKey(rs.getBytes(2));
@@ -1955,8 +1954,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps = txn.prepareStatement(sql);
 			ps.setString(1, t.getString());
 			rs = ps.executeQuery();
-			Map<ContactId, TransportKeys> keys =
+			Map<ContactId, TransportKeys> keys = new HashMap<>();
-					new HashMap<ContactId, TransportKeys>();
 			for (int i = 0; rs.next(); i++) {
 				// There should be three times as many incoming keys
 				if (inKeys.size() < (i + 1) * 3) throw new DbStateException();
@@ -2074,8 +2072,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		try {
 			// Determine which keys are being removed
-			List<String> removed = new ArrayList<String>();
+			List<String> removed = new ArrayList<>();
-			Map<String, byte[]> retained = new HashMap<String, byte[]>();
+			Map<String, byte[]> retained = new HashMap<>();
 			for (Entry<String, byte[]> e : meta.entrySet()) {
 				if (e.getValue() == REMOVE) removed.add(e.getKey());
 				else retained.put(e.getKey(), e.getValue());

bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java

@@ -15,7 +15,7 @@ import javax.annotation.concurrent.ThreadSafe;
 class EventBusImpl implements EventBus {
 
 	private final Collection<EventListener> listeners =
-			new CopyOnWriteArrayList<EventListener>();
+			new CopyOnWriteArrayList<>();
 
 	@Override
 	public void addListener(EventListener l) {

bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java

@@ -50,10 +50,9 @@ class KeyAgreementConnector {
 	private final PluginManager pluginManager;
 	private final CompletionService<KeyAgreementConnection> connect;
 
-	private final List<KeyAgreementListener> listeners =
+	private final List<KeyAgreementListener> listeners = new ArrayList<>();
-			new ArrayList<KeyAgreementListener>();
 	private final List<Future<KeyAgreementConnection>> pending =
-			new ArrayList<Future<KeyAgreementConnection>>();
+			new ArrayList<>();
 
 	private volatile boolean connecting = false;
 	private volatile boolean alice = false;
@@ -65,8 +64,7 @@ class KeyAgreementConnector {
 		this.clock = clock;
 		this.crypto = crypto;
 		this.pluginManager = pluginManager;
-		connect = new ExecutorCompletionService<KeyAgreementConnection>(
+		connect = new ExecutorCompletionService<>(ioExecutor);
-				ioExecutor);
 	}
 
 	public Payload listen(KeyPair localKeyPair) {
@@ -75,8 +73,7 @@ class KeyAgreementConnector {
 		byte[] commitment = crypto.deriveKeyCommitment(
 				localKeyPair.getPublic().getEncoded());
 		// Start all listeners and collect their descriptors
-		List<TransportDescriptor> descriptors =
+		List<TransportDescriptor> descriptors = new ArrayList<>();
-				new ArrayList<TransportDescriptor>();
 		for (DuplexPlugin plugin : pluginManager.getKeyAgreementPlugins()) {
 			KeyAgreementListener l =
 					plugin.createKeyAgreementListener(commitment);
@@ -132,10 +129,7 @@ class KeyAgreementConnector {
 			LOG.info("Interrupted while waiting for connection");
 			Thread.currentThread().interrupt();
 			return null;
-		} catch (ExecutionException e) {
+		} catch (ExecutionException | IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			return null;
-		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return null;
 		} finally {

bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java

@@ -51,8 +51,7 @@ class PayloadParserImpl implements PayloadParser {
 		byte[] commitment = payload.getRaw(1);
 		if (commitment.length != COMMIT_LENGTH) throw new FormatException();
 		// Remaining elements: transport descriptors
-		List<TransportDescriptor> recognised =
+		List<TransportDescriptor> recognised = new ArrayList<>();
-				new ArrayList<TransportDescriptor>();
 		for (int i = 2; i < payload.size(); i++) {
 			BdfList descriptor = payload.getList(i);
 			long transportId = descriptor.getLong(0);

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java

@@ -63,9 +63,9 @@ class LifecycleManagerImpl implements LifecycleManager {
 		this.crypto = crypto;
 		this.authorFactory = authorFactory;
 		this.identityManager = identityManager;
-		services = new CopyOnWriteArrayList<Service>();
+		services = new CopyOnWriteArrayList<>();
-		clients = new CopyOnWriteArrayList<Client>();
+		clients = new CopyOnWriteArrayList<>();
-		executors = new CopyOnWriteArrayList<ExecutorService>();
+		executors = new CopyOnWriteArrayList<>();
 	}
 
 	@Override
@@ -88,7 +88,7 @@ class LifecycleManagerImpl implements LifecycleManager {
 		executors.add(e);
 	}
 
-	private LocalAuthor createLocalAuthor(final String nickname) {
+	private LocalAuthor createLocalAuthor(String nickname) {
 		long now = System.currentTimeMillis();
 		KeyPair keyPair = crypto.generateSignatureKeyPair();
 		byte[] publicKey = keyPair.getPublic().getEncoded();
@@ -203,9 +203,7 @@ class LifecycleManagerImpl implements LifecycleManager {
 			if (LOG.isLoggable(INFO))
 				LOG.info("Closing database took " + duration + " ms");
 			shutdownLatch.countDown();
-		} catch (DbException e) {
+		} catch (DbException | ServiceException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} catch (ServiceException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		} finally {
 			startStopSemaphore.release();

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleModule.java

@@ -37,7 +37,7 @@ public class LifecycleModule {
 
 	public LifecycleModule() {
 		// The thread pool is unbounded, so use direct handoff
-		BlockingQueue<Runnable> queue = new SynchronousQueue<Runnable>();
+		BlockingQueue<Runnable> queue = new SynchronousQueue<>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();

bramble-core/src/main/java/org/briarproject/bramble/lifecycle/ShutdownManagerImpl.java

@@ -21,7 +21,7 @@ class ShutdownManagerImpl implements ShutdownManager {
 	private int nextHandle = 0;
 
 	ShutdownManagerImpl() {
-		hooks = new HashMap<Integer, Thread>();
+		hooks = new HashMap<>();
 	}
 
 	@Override

bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionManagerImpl.java

@@ -134,11 +134,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException e) {
+			} catch (IOException | DbException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				disposeReader(true, false);
-				return;
-			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;
@@ -249,11 +245,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException e) {
+			} catch (IOException | DbException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				disposeReader(true, false);
-				return;
-			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;
@@ -266,12 +258,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			contactId = ctx.getContactId();
 			connectionRegistry.registerConnection(contactId, transportId, true);
 			// Start the outgoing session on another thread
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(this::runOutgoingSession);
-				@Override
-				public void run() {
-					runOutgoingSession();
-				}
-			});
 			try {
 				// Create and run the incoming session
 				incomingSession = createIncomingSession(ctx, reader);
@@ -368,12 +355,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 				return;
 			}
 			// Start the incoming session on another thread
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(this::runIncomingSession);
-				@Override
-				public void run() {
-					runIncomingSession();
-				}
-			});
 			try {
 				// Create and run the outgoing session
 				outgoingSession = createDuplexOutgoingSession(ctx, writer);
@@ -391,11 +373,7 @@ class ConnectionManagerImpl implements ConnectionManager {
 			try {
 				byte[] tag = readTag(reader);
 				ctx = keyManager.getStreamContext(transportId, tag);
-			} catch (IOException e) {
+			} catch (IOException | DbException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				disposeReader(true, false);
-				return;
-			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				disposeReader(true, false);
 				return;

bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionRegistryImpl.java

@@ -42,8 +42,8 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 	@Inject
 	ConnectionRegistryImpl(EventBus eventBus) {
 		this.eventBus = eventBus;
-		connections = new HashMap<TransportId, Map<ContactId, Integer>>();
+		connections = new HashMap<>();
-		contactCounts = new HashMap<ContactId, Integer>();
+		contactCounts = new HashMap<>();
 	}
 
 	@Override
@@ -58,7 +58,7 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 		try {
 			Map<ContactId, Integer> m = connections.get(t);
 			if (m == null) {
-				m = new HashMap<ContactId, Integer>();
+				m = new HashMap<>();
 				connections.put(t, m);
 			}
 			Integer count = m.get(c);
@@ -124,7 +124,7 @@ class ConnectionRegistryImpl implements ConnectionRegistry {
 		try {
 			Map<ContactId, Integer> m = connections.get(t);
 			if (m == null) return Collections.emptyList();
-			List<ContactId> ids = new ArrayList<ContactId>(m.keySet());
+			List<ContactId> ids = new ArrayList<>(m.keySet());
 			if (LOG.isLoggable(INFO))
 				LOG.info(ids.size() + " contacts connected");
 			return ids;

bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java

@@ -82,10 +82,10 @@ class PluginManagerImpl implements PluginManager, Service {
 		this.settingsManager = settingsManager;
 		this.transportPropertyManager = transportPropertyManager;
 		this.uiCallback = uiCallback;
-		plugins = new ConcurrentHashMap<TransportId, Plugin>();
+		plugins = new ConcurrentHashMap<>();
-		simplexPlugins = new CopyOnWriteArrayList<SimplexPlugin>();
+		simplexPlugins = new CopyOnWriteArrayList<>();
-		duplexPlugins = new CopyOnWriteArrayList<DuplexPlugin>();
+		duplexPlugins = new CopyOnWriteArrayList<>();
-		startLatches = new ConcurrentHashMap<TransportId, CountDownLatch>();
+		startLatches = new ConcurrentHashMap<>();
 	}
 
 	@Override
@@ -156,17 +156,17 @@ class PluginManagerImpl implements PluginManager, Service {
 
 	@Override
 	public Collection<SimplexPlugin> getSimplexPlugins() {
-		return new ArrayList<SimplexPlugin>(simplexPlugins);
+		return new ArrayList<>(simplexPlugins);
 	}
 
 	@Override
 	public Collection<DuplexPlugin> getDuplexPlugins() {
-		return new ArrayList<DuplexPlugin>(duplexPlugins);
+		return new ArrayList<>(duplexPlugins);
 	}
 
 	@Override
 	public Collection<DuplexPlugin> getKeyAgreementPlugins() {
-		List<DuplexPlugin> supported = new ArrayList<DuplexPlugin>();
+		List<DuplexPlugin> supported = new ArrayList<>();
 		for (DuplexPlugin d : duplexPlugins)
 			if (d.supportsKeyAgreement()) supported.add(d);
 		return supported;

bramble-core/src/main/java/org/briarproject/bramble/plugin/Poller.java

@@ -66,7 +66,7 @@ class Poller implements EventListener {
 		this.random = random;
 		this.clock = clock;
 		lock = new ReentrantLock();
-		tasks = new HashMap<TransportId, PollTask>();
+		tasks = new HashMap<>();
 	}
 
 	@Override
@@ -111,30 +111,24 @@ class Poller implements EventListener {
 			connectToContact(c, (DuplexPlugin) p);
 	}
 
-	private void connectToContact(final ContactId c, final SimplexPlugin p) {
+	private void connectToContact(ContactId c, SimplexPlugin p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			TransportId t = p.getId();
-			public void run() {
+			if (!connectionRegistry.isConnected(c, t)) {
-				TransportId t = p.getId();
+				TransportConnectionWriter w = p.createWriter(c);
-				if (!connectionRegistry.isConnected(c, t)) {
+				if (w != null)
-					TransportConnectionWriter w = p.createWriter(c);
+					connectionManager.manageOutgoingConnection(c, t, w);
-					if (w != null)
-						connectionManager.manageOutgoingConnection(c, t, w);
-				}
 			}
 		});
 	}
 
-	private void connectToContact(final ContactId c, final DuplexPlugin p) {
+	private void connectToContact(ContactId c, DuplexPlugin p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			TransportId t = p.getId();
-			public void run() {
+			if (!connectionRegistry.isConnected(c, t)) {
-				TransportId t = p.getId();
+				DuplexTransportConnection d = p.createConnection(c);
-				if (!connectionRegistry.isConnected(c, t)) {
+				if (d != null)
-					DuplexTransportConnection d = p.createConnection(c);
+					connectionManager.manageOutgoingConnection(c, t, d);
-					if (d != null)
-						connectionManager.manageOutgoingConnection(c, t, d);
-				}
 			}
 		});
 	}
@@ -159,14 +153,10 @@ class Poller implements EventListener {
 		try {
 			PollTask scheduled = tasks.get(t);
 			if (scheduled == null || due < scheduled.due) {
-				final PollTask task = new PollTask(p, due, randomiseNext);
+				PollTask task = new PollTask(p, due, randomiseNext);
 				tasks.put(t, task);
-				scheduler.schedule(new Runnable() {
+				scheduler.schedule(
-					@Override
+						() -> ioExecutor.execute(task), delay, MILLISECONDS);
-					public void run() {
-						ioExecutor.execute(task);
-					}
-				}, delay, MILLISECONDS);
 			}
 		} finally {
 			lock.unlock();
@@ -174,7 +164,7 @@ class Poller implements EventListener {
 	}
 
 	@IoExecutor
-	private void poll(final Plugin p) {
+	private void poll(Plugin p) {
 		TransportId t = p.getId();
 		if (LOG.isLoggable(INFO)) LOG.info("Polling plugin " + t);
 		p.poll(connectionRegistry.getConnectedContacts(t));

bramble-core/src/main/java/org/briarproject/bramble/plugin/file/FilePlugin.java

@@ -108,7 +108,7 @@ abstract class FilePlugin implements SimplexPlugin {
 		}
 	}
 
-	protected void createReaderFromFile(final File f) {
+	protected void createReaderFromFile(File f) {
 		if (!running) return;
 		ioExecutor.execute(new ReaderCreator(f));
 	}

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java

@@ -63,7 +63,7 @@ class LanTcpPlugin extends TcpPlugin {
 		TransportProperties p = callback.getLocalProperties();
 		String oldIpPorts = p.get(PROP_IP_PORTS);
 		List<InetSocketAddress> olds = parseSocketAddresses(oldIpPorts);
-		List<InetSocketAddress> locals = new LinkedList<InetSocketAddress>();
+		List<InetSocketAddress> locals = new LinkedList<>();
 		for (InetAddress local : getLocalIpAddresses()) {
 			if (isAcceptableAddress(local)) {
 				// If this is the old address, try to use the same port
@@ -82,7 +82,7 @@ class LanTcpPlugin extends TcpPlugin {
 	private List<InetSocketAddress> parseSocketAddresses(String ipPorts) {
 		if (StringUtils.isNullOrEmpty(ipPorts)) return Collections.emptyList();
 		String[] split = ipPorts.split(SEPARATOR);
-		List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>();
+		List<InetSocketAddress> addresses = new ArrayList<>();
 		for (String ipPort : split) {
 			InetSocketAddress a = parseSocketAddress(ipPort);
 			if (a != null) addresses.add(a);
@@ -95,7 +95,7 @@ class LanTcpPlugin extends TcpPlugin {
 		String ipPort = getIpPortString(a);
 		// Get the list of recently used addresses
 		String setting = callback.getSettings().get(PREF_LAN_IP_PORTS);
-		List<String> recent = new ArrayList<String>();
+		List<String> recent = new ArrayList<>();
 		if (!StringUtils.isNullOrEmpty(setting))
 			Collections.addAll(recent, setting.split(SEPARATOR));
 		// Is the address already in the list?
@@ -111,7 +111,7 @@ class LanTcpPlugin extends TcpPlugin {
 				recent = recent.subList(0, MAX_ADDRESSES);
 			setting = StringUtils.join(recent, SEPARATOR);
 			// Update the list of addresses shared with contacts
-			List<String> shared = new ArrayList<String>(recent);
+			List<String> shared = new ArrayList<>(recent);
 			Collections.sort(shared);
 			String property = StringUtils.join(shared, SEPARATOR);
 			TransportProperties properties = new TransportProperties();
@@ -260,16 +260,12 @@ class LanTcpPlugin extends TcpPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
+				Socket s = ss.accept();
-				public KeyAgreementConnection call() throws IOException {
+				if (LOG.isLoggable(INFO))
-					Socket s = ss.accept();
+					LOG.info(ID.getString() + ": Incoming connection");
-					if (LOG.isLoggable(INFO))
+				return new KeyAgreementConnection(
-						LOG.info(ID.getString() + ": Incoming connection");
+						new TcpTransportConnection(LanTcpPlugin.this, s), ID);
-					return new KeyAgreementConnection(
-							new TcpTransportConnection(LanTcpPlugin.this, s),
-							ID);
-				}
 			};
 		}
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/PortMapperImpl.java

@@ -37,7 +37,7 @@ class PortMapperImpl implements PortMapper {
 	}
 
 	@Override
-	public MappingResult map(final int port) {
+	public MappingResult map(int port) {
 		if (!started.getAndSet(true)) start();
 		if (gateway == null) return null;
 		InetAddress internal = gateway.getLocalAddress();
@@ -50,12 +50,7 @@ class PortMapperImpl implements PortMapper {
 			succeeded = gateway.addPortMapping(port, port,
 					getHostAddress(internal), "TCP", "TCP");
 			if (succeeded) {
-				shutdownManager.addShutdownHook(new Runnable() {
+				shutdownManager.addShutdownHook(() -> deleteMapping(port));
-					@Override
-					public void run() {
-						deleteMapping(port);
-					}
-				});
 			}
 			String externalString = gateway.getExternalIPAddress();
 			if (LOG.isLoggable(INFO))
@@ -63,9 +58,7 @@ class PortMapperImpl implements PortMapper {
 						"External address " + scrubInetAddress(externalString));
 			if (externalString != null)
 				external = InetAddress.getByName(externalString);
-		} catch (IOException e) {
+		} catch (IOException | SAXException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} catch (SAXException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 		return new MappingResult(internal, external, port, succeeded);
@@ -82,11 +75,7 @@ class PortMapperImpl implements PortMapper {
 		GatewayDiscover d = new GatewayDiscover();
 		try {
 			d.discover();
-		} catch (IOException e) {
+		} catch (IOException | SAXException | ParserConfigurationException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} catch (SAXException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} catch (ParserConfigurationException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 		gateway = d.getValidGateway();
@@ -97,9 +86,7 @@ class PortMapperImpl implements PortMapper {
 			gateway.deletePortMapping(port, "TCP");
 			if (LOG.isLoggable(INFO))
 				LOG.info("Deleted mapping for port " + port);
-		} catch (IOException e) {
+		} catch (IOException | SAXException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} catch (SAXException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

@@ -110,41 +110,37 @@ abstract class TcpPlugin implements DuplexPlugin {
 	}
 
 	protected void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			if (!running) return;
-			public void run() {
+			ServerSocket ss = null;
-				if (!running) return;
+			for (InetSocketAddress addr : getLocalSocketAddresses()) {
-				ServerSocket ss = null;
+				try {
-				for (InetSocketAddress addr : getLocalSocketAddresses()) {
+					ss = new ServerSocket();
-					try {
+					ss.bind(addr);
-						ss = new ServerSocket();
+					break;
-						ss.bind(addr);
+				} catch (IOException e) {
-						break;
+					if (LOG.isLoggable(INFO))
-					} catch (IOException e) {
+						LOG.info("Failed to bind " + scrubSocketAddress(addr));
-						if (LOG.isLoggable(INFO))
-							LOG.info("Failed to bind " +
-									scrubSocketAddress(addr));
-						tryToClose(ss);
-					}
-				}
-				if (ss == null || !ss.isBound()) {
-					LOG.info("Could not bind server socket");
-					return;
-				}
-				if (!running) {
 					tryToClose(ss);
-					return;
 				}
-				socket = ss;
-				backoff.reset();
-				InetSocketAddress local =
-						(InetSocketAddress) ss.getLocalSocketAddress();
-				setLocalSocketAddress(local);
-				if (LOG.isLoggable(INFO))
-					LOG.info("Listening on " + scrubSocketAddress(local));
-				callback.transportEnabled();
-				acceptContactConnections();
 			}
+			if (ss == null || !ss.isBound()) {
+				LOG.info("Could not bind server socket");
+				return;
+			}
+			if (!running) {
+				tryToClose(ss);
+				return;
+			}
+			socket = ss;
+			backoff.reset();
+			InetSocketAddress local =
+					(InetSocketAddress) ss.getLocalSocketAddress();
+			setLocalSocketAddress(local);
+			if (LOG.isLoggable(INFO))
+				LOG.info("Listening on " + scrubSocketAddress(local));
+			callback.transportEnabled();
+			acceptContactConnections();
 		});
 	}
 
@@ -218,17 +214,13 @@ abstract class TcpPlugin implements DuplexPlugin {
 		}
 	}
 
-	private void connectAndCallBack(final ContactId c,
+	private void connectAndCallBack(ContactId c, TransportProperties p) {
-			final TransportProperties p) {
+		ioExecutor.execute(() -> {
-		ioExecutor.execute(new Runnable() {
+			if (!isRunning()) return;
-			@Override
+			DuplexTransportConnection d = createConnection(p);
-			public void run() {
+			if (d != null) {
-				if (!isRunning()) return;
+				backoff.reset();
-				DuplexTransportConnection d = createConnection(p);
+				callback.outgoingConnectionCreated(c, d);
-				if (d != null) {
-					backoff.reset();
-					callback.outgoingConnectionCreated(c, d);
-				}
 			}
 		});
 	}
@@ -317,7 +309,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return Collections.emptyList();
 		}
-		List<InetAddress> addrs = new ArrayList<InetAddress>();
+		List<InetAddress> addrs = new ArrayList<>();
 		for (NetworkInterface iface : ifaces)
 			addrs.addAll(Collections.list(iface.getInetAddresses()));
 		return addrs;

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/WanTcpPlugin.java

@@ -43,7 +43,7 @@ class WanTcpPlugin extends TcpPlugin {
 		// Use the same address and port as last time if available
 		TransportProperties p = callback.getLocalProperties();
 		InetSocketAddress old = parseSocketAddress(p.get(PROP_IP_PORT));
-		List<InetSocketAddress> addrs = new LinkedList<InetSocketAddress>();
+		List<InetSocketAddress> addrs = new LinkedList<>();
 		for (InetAddress a : getLocalIpAddresses()) {
 			if (isAcceptableAddress(a)) {
 				// If this is the old address, try to use the same port

bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java

@@ -144,8 +144,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	public Map<TransportId, TransportProperties> getLocalProperties(
 			Transaction txn) throws DbException {
 		try {
-			Map<TransportId, TransportProperties> local =
+			Map<TransportId, TransportProperties> local = new HashMap<>();
-					new HashMap<TransportId, TransportProperties>();
 			// Find the latest local update for each transport
 			Map<TransportId, LatestUpdate> latest = findLatestLocal(txn);
 			// Retrieve and parse the latest local properties
@@ -192,8 +191,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	@Override
 	public Map<ContactId, TransportProperties> getRemoteProperties(
 			TransportId t) throws DbException {
-		Map<ContactId, TransportProperties> remote =
+		Map<ContactId, TransportProperties> remote = new HashMap<>();
-				new HashMap<ContactId, TransportProperties>();
 		// TODO: Transaction can be read-only when code is simplified
 		Transaction txn = db.startTransaction(false);
 		try {
@@ -321,8 +319,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 	private Map<TransportId, LatestUpdate> findLatestLocal(Transaction txn)
 			throws DbException, FormatException {
 		// TODO: This can be simplified before 1.0
-		Map<TransportId, LatestUpdate> latestUpdates =
+		Map<TransportId, LatestUpdate> latestUpdates = new HashMap<>();
-				new HashMap<TransportId, LatestUpdate>();
 		Map<MessageId, BdfDictionary> metadata = clientHelper
 				.getMessageMetadataAsDictionary(txn, localGroup.getId());
 		for (Entry<MessageId, BdfDictionary> e : metadata.entrySet()) {

bramble-core/src/main/java/org/briarproject/bramble/reliability/Receiver.java

@@ -41,7 +41,7 @@ class Receiver implements ReadHandler {
 	Receiver(Clock clock, Sender sender) {
 		this.sender = sender;
 		this.clock = clock;
-		dataFrames = new TreeSet<Data>(new SequenceNumberComparator());
+		dataFrames = new TreeSet<>(new SequenceNumberComparator());
 	}
 
 	Data read() throws IOException, InterruptedException {

bramble-core/src/main/java/org/briarproject/bramble/reliability/ReliabilityLayerImpl.java

@@ -42,48 +42,44 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
 		this.executor = executor;
 		this.clock = clock;
 		this.writeHandler = writeHandler;
-		writes = new LinkedBlockingQueue<byte[]>();
+		writes = new LinkedBlockingQueue<>();
 	}
 
 	@Override
 	public void start() {
 		SlipEncoder encoder = new SlipEncoder(this);
-		final Sender sender = new Sender(clock, encoder);
+		Sender sender = new Sender(clock, encoder);
 		receiver = new Receiver(clock, sender);
 		decoder = new SlipDecoder(receiver, Data.MAX_LENGTH);
 		inputStream = new ReceiverInputStream(receiver);
 		outputStream = new SenderOutputStream(sender);
 		running = true;
-		executor.execute(new Runnable() {
+		executor.execute(() -> {
-			@Override
+			long now = clock.currentTimeMillis();
-			public void run() {
+			long next = now + TICK_INTERVAL;
-				long now = clock.currentTimeMillis();
+			try {
-				long next = now + TICK_INTERVAL;
+				while (running) {
-				try {
+					byte[] b = null;
-					while (running) {
+					while (now < next && b == null) {
-						byte[] b = null;
+						b = writes.poll(next - now, MILLISECONDS);
-						while (now < next && b == null) {
+						if (!running) return;
-							b = writes.poll(next - now, MILLISECONDS);
+						now = clock.currentTimeMillis();
-							if (!running) return;
+					}
-							now = clock.currentTimeMillis();
+					if (b == null) {
-						}
+						sender.tick();
-						if (b == null) {
+						while (next <= now) next += TICK_INTERVAL;
-							sender.tick();
+					} else {
-							while (next <= now) next += TICK_INTERVAL;
+						if (b.length == 0) return; // Poison pill
-						} else {
+						writeHandler.handleWrite(b);
-							if (b.length == 0) return; // Poison pill
-							writeHandler.handleWrite(b);
-						}
 					}
-				} catch (InterruptedException e) {
-					LOG.warning("Interrupted while waiting to write");
-					Thread.currentThread().interrupt();
-					running = false;
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					running = false;
 				}
+			} catch (InterruptedException e) {
+				LOG.warning("Interrupted while waiting to write");
+				Thread.currentThread().interrupt();
+				running = false;
+			} catch (IOException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				running = false;
 			}
 		});
 	}

bramble-core/src/main/java/org/briarproject/bramble/reliability/Sender.java

@@ -46,7 +46,7 @@ class Sender {
 	Sender(Clock clock, WriteHandler writeHandler) {
 		this.clock = clock;
 		this.writeHandler = writeHandler;
-		outstanding = new LinkedList<Outstanding>();
+		outstanding = new LinkedList<>();
 	}
 
 	void sendAck(long sequenceNumber, int windowSize) throws IOException {
@@ -136,7 +136,7 @@ class Sender {
 					if (now - o.lastTransmitted > rto) {
 						it.remove();
 						if (retransmit == null)
-							retransmit = new ArrayList<Outstanding>();
+							retransmit = new ArrayList<>();
 						retransmit.add(o);
 						// Update the retransmission timeout
 						rto <<= 1;

bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java

@@ -54,12 +54,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(DuplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE =
+	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
-			new ThrowingRunnable<IOException>() {
-				@Override
-				public void run() {
-				}
-			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;
@@ -83,7 +78,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
 		this.recordWriter = recordWriter;
-		writerTasks = new LinkedBlockingQueue<ThrowingRunnable<IOException>>();
+		writerTasks = new LinkedBlockingQueue<>();
 	}
 
 	@IoExecutor

bramble-core/src/main/java/org/briarproject/bramble/sync/RecordReaderImpl.java

@@ -116,7 +116,7 @@ class RecordReaderImpl implements RecordReader {
 	private List<MessageId> readMessageIds() throws IOException {
 		if (payloadLength == 0) throw new FormatException();
 		if (payloadLength % UniqueId.LENGTH != 0) throw new FormatException();
-		List<MessageId> ids = new ArrayList<MessageId>();
+		List<MessageId> ids = new ArrayList<>();
 		for (int off = 0; off < payloadLength; off += UniqueId.LENGTH) {
 			byte[] id = new byte[UniqueId.LENGTH];
 			System.arraycopy(payload, off, id, 0, UniqueId.LENGTH);

bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java

@@ -43,12 +43,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(SimplexOutgoingSession.class.getName());
 
-	private static final ThrowingRunnable<IOException> CLOSE =
+	private static final ThrowingRunnable<IOException> CLOSE = () -> {};
-			new ThrowingRunnable<IOException>() {
-				@Override
-				public void run() {
-				}
-			};
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor;
@@ -71,7 +66,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 		this.maxLatency = maxLatency;
 		this.recordWriter = recordWriter;
 		outstandingQueries = new AtomicInteger(2); // One per type of record
-		writerTasks = new LinkedBlockingQueue<ThrowingRunnable<IOException>>();
+		writerTasks = new LinkedBlockingQueue<>();
 	}
 
 	@IoExecutor

bramble-core/src/main/java/org/briarproject/bramble/sync/ValidationManagerImpl.java

@@ -64,8 +64,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		this.dbExecutor = dbExecutor;
 		this.validationExecutor = validationExecutor;
 		this.messageFactory = messageFactory;
-		validators = new ConcurrentHashMap<ClientId, MessageValidator>();
+		validators = new ConcurrentHashMap<>();
-		hooks = new ConcurrentHashMap<ClientId, IncomingMessageHook>();
+		hooks = new ConcurrentHashMap<>();
 	}
 
 	@Override
@@ -93,19 +93,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		hooks.put(c, hook);
 	}
 
-	private void validateOutstandingMessagesAsync(final ClientId c) {
+	private void validateOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> validateOutstandingMessages(c));
-			@Override
-			public void run() {
-				validateOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
 	private void validateOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> unvalidated = new LinkedList<MessageId>();
+			Queue<MessageId> unvalidated = new LinkedList<>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				unvalidated.addAll(db.getMessagesToValidate(txn, c));
@@ -119,14 +114,9 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void validateNextMessageAsync(final Queue<MessageId> unvalidated) {
+	private void validateNextMessageAsync(Queue<MessageId> unvalidated) {
 		if (unvalidated.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> validateNextMessage(unvalidated));
-			@Override
-			public void run() {
-				validateNextMessage(unvalidated);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -158,19 +148,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void deliverOutstandingMessagesAsync(final ClientId c) {
+	private void deliverOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> deliverOutstandingMessages(c));
-			@Override
-			public void run() {
-				deliverOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
 	private void deliverOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> pending = new LinkedList<MessageId>();
+			Queue<MessageId> pending = new LinkedList<>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				pending.addAll(db.getPendingMessages(txn, c));
@@ -184,15 +169,9 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void deliverNextPendingMessageAsync(
+	private void deliverNextPendingMessageAsync(Queue<MessageId> pending) {
-			final Queue<MessageId> pending) {
 		if (pending.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> deliverNextPendingMessage(pending));
-			@Override
-			public void run() {
-				deliverNextPendingMessage(pending);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -229,8 +208,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 							pending.addAll(getPendingDependents(txn, id));
 							if (result.share) {
 								db.setMessageShared(txn, id);
-								toShare = new LinkedList<MessageId>(
+								toShare = new LinkedList<>(states.keySet());
-										states.keySet());
 							}
 						} else {
 							invalidate = getDependentsToInvalidate(txn, id);
@@ -255,13 +233,8 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void validateMessageAsync(final Message m, final Group g) {
+	private void validateMessageAsync(Message m, Group g) {
-		validationExecutor.execute(new Runnable() {
+		validationExecutor.execute(() -> validateMessage(m, g));
-			@Override
-			public void run() {
-				validateMessage(m, g);
-			}
-		});
 	}
 
 	@ValidationExecutor
@@ -277,21 +250,16 @@ class ValidationManagerImpl implements ValidationManager, Service,
 			} catch (InvalidMessageException e) {
 				if (LOG.isLoggable(INFO))
 					LOG.log(INFO, e.toString(), e);
-				Queue<MessageId> invalidate = new LinkedList<MessageId>();
+				Queue<MessageId> invalidate = new LinkedList<>();
 				invalidate.add(m.getId());
 				invalidateNextMessageAsync(invalidate);
 			}
 		}
 	}
 
-	private void storeMessageContextAsync(final Message m, final ClientId c,
+	private void storeMessageContextAsync(Message m, ClientId c,
-			final MessageContext result) {
+			MessageContext result) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> storeMessageContext(m, c, result));
-			@Override
-			public void run() {
-				storeMessageContext(m, c, result);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -331,8 +299,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 							pending = getPendingDependents(txn, id);
 							if (result.share) {
 								db.setMessageShared(txn, id);
-								toShare =
+								toShare = new LinkedList<>(dependencies);
-										new LinkedList<MessageId>(dependencies);
 							}
 						} else {
 							invalidate = getDependentsToInvalidate(txn, id);
@@ -378,7 +345,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	@DatabaseExecutor
 	private Queue<MessageId> getPendingDependents(Transaction txn, MessageId m)
 			throws DbException {
-		Queue<MessageId> pending = new LinkedList<MessageId>();
+		Queue<MessageId> pending = new LinkedList<>();
 		Map<MessageId, State> states = db.getMessageDependents(txn, m);
 		for (Entry<MessageId, State> e : states.entrySet()) {
 			if (e.getValue() == PENDING) pending.add(e.getKey());
@@ -386,19 +353,14 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		return pending;
 	}
 
-	private void shareOutstandingMessagesAsync(final ClientId c) {
+	private void shareOutstandingMessagesAsync(ClientId c) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> shareOutstandingMessages(c));
-			@Override
-			public void run() {
-				shareOutstandingMessages(c);
-			}
-		});
 	}
 
 	@DatabaseExecutor
 	private void shareOutstandingMessages(ClientId c) {
 		try {
-			Queue<MessageId> toShare = new LinkedList<MessageId>();
+			Queue<MessageId> toShare = new LinkedList<>();
 			Transaction txn = db.startTransaction(true);
 			try {
 				toShare.addAll(db.getMessagesToShare(txn, c));
@@ -418,14 +380,9 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	 * This method should only be called for messages that have all their
 	 * dependencies delivered and have been delivered themselves.
 	 */
-	private void shareNextMessageAsync(final Queue<MessageId> toShare) {
+	private void shareNextMessageAsync(Queue<MessageId> toShare) {
 		if (toShare.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> shareNextMessage(toShare));
-			@Override
-			public void run() {
-				shareNextMessage(toShare);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -452,14 +409,9 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void invalidateNextMessageAsync(final Queue<MessageId> invalidate) {
+	private void invalidateNextMessageAsync(Queue<MessageId> invalidate) {
 		if (invalidate.isEmpty()) return;
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> invalidateNextMessage(invalidate));
-			@Override
-			public void run() {
-				invalidateNextMessage(invalidate);
-			}
-		});
 	}
 
 	@DatabaseExecutor
@@ -496,7 +448,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	@DatabaseExecutor
 	private Queue<MessageId> getDependentsToInvalidate(Transaction txn,
 			MessageId m) throws DbException {
-		Queue<MessageId> invalidate = new LinkedList<MessageId>();
+		Queue<MessageId> invalidate = new LinkedList<>();
 		Map<MessageId, State> states = db.getMessageDependents(txn, m);
 		for (Entry<MessageId, State> e : states.entrySet()) {
 			if (e.getValue() != INVALID) invalidate.add(e.getKey());
@@ -514,17 +466,12 @@ class ValidationManagerImpl implements ValidationManager, Service,
 		}
 	}
 
-	private void loadGroupAndValidateAsync(final Message m) {
+	private void loadGroupAndValidateAsync(Message m) {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> loadGroupAndValidate(m));
-			@Override
-			public void run() {
-				loadGroupAndValidate(m);
-			}
-		});
 	}
 
 	@DatabaseExecutor
-	private void loadGroupAndValidate(final Message m) {
+	private void loadGroupAndValidate(Message m) {
 		try {
 			Group g;
 			Transaction txn = db.startTransaction(true);

bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java

@@ -58,15 +58,14 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		this.pluginConfig = pluginConfig;
 		this.transportKeyManagerFactory = transportKeyManagerFactory;
 		// Use a ConcurrentHashMap as a thread-safe set
-		activeContacts = new ConcurrentHashMap<ContactId, Boolean>();
+		activeContacts = new ConcurrentHashMap<>();
-		managers = new ConcurrentHashMap<TransportId, TransportKeyManager>();
+		managers = new ConcurrentHashMap<>();
 	}
 
 	@Override
 	public void startService() throws ServiceException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		Map<TransportId, Integer> transports =
+		Map<TransportId, Integer> transports = new HashMap<>();
-				new HashMap<TransportId, Integer>();
 		for (SimplexPluginFactory f : pluginConfig.getSimplexFactories())
 			transports.put(f.getId(), f.getMaxLatency());
 		for (DuplexPluginFactory f : pluginConfig.getDuplexFactories())
@@ -156,14 +155,10 @@ class KeyManagerImpl implements KeyManager, Service, EventListener {
 		}
 	}
 
-	private void removeContact(final ContactId c) {
+	private void removeContact(ContactId c) {
 		activeContacts.remove(c);
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
+			for (TransportKeyManager m : managers.values()) m.removeContact(c);
-			public void run() {
-				for (TransportKeyManager m : managers.values())
-					m.removeContact(c);
-			}
 		});
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/ReorderingWindow.java

@@ -45,7 +45,7 @@ class ReorderingWindow {
 	}
 
 	List<Long> getUnseen() {
-		List<Long> unseen = new ArrayList<Long>(seen.length);
+		List<Long> unseen = new ArrayList<>(seen.length);
 		for (int i = 0; i < seen.length; i++)
 			if (!seen[i]) unseen.add(base + i);
 		return unseen;
@@ -69,8 +69,8 @@ class ReorderingWindow {
 			return new Change(added, removed);
 		}
 		// Record the elements that will be added and removed
-		List<Long> added = new ArrayList<Long>(slide);
+		List<Long> added = new ArrayList<>(slide);
-		List<Long> removed = new ArrayList<Long>(slide);
+		List<Long> removed = new ArrayList<>(slide);
 		for (int i = 0; i < slide; i++) {
 			if (!seen[i]) removed.add(base + i);
 			added.add(base + seen.length + i);

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -65,9 +65,9 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		this.transportId = transportId;
 		rotationPeriodLength = maxLatency + MAX_CLOCK_DIFFERENCE;
 		lock = new ReentrantLock();
-		inContexts = new HashMap<Bytes, TagContext>();
+		inContexts = new HashMap<>();
-		outContexts = new HashMap<ContactId, MutableOutgoingKeys>();
+		outContexts = new HashMap<>();
-		keys = new HashMap<ContactId, MutableTransportKeys>();
+		keys = new HashMap<>();
 	}
 
 	@Override
@@ -134,32 +134,22 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 	}
 
 	private void scheduleKeyRotation(long now) {
-		Runnable task = new Runnable() {
-			@Override
-			public void run() {
-				rotateKeys();
-			}
-		};
 		long delay = rotationPeriodLength - now % rotationPeriodLength;
-		scheduler.schedule(task, delay, MILLISECONDS);
+		scheduler.schedule((Runnable) this::rotateKeys, delay, MILLISECONDS);
 	}
 
 	private void rotateKeys() {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
+			try {
-			public void run() {
+				Transaction txn = db.startTransaction(false);
 				try {
-					Transaction txn = db.startTransaction(false);
+					rotateKeys(txn);
-					try {
+					db.commitTransaction(txn);
-						rotateKeys(txn);
+				} finally {
-						db.commitTransaction(txn);
+					db.endTransaction(txn);
-					} finally {
-						db.endTransaction(txn);
-					}
-				} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
 				}
+			} catch (DbException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		});
 	}
@@ -272,8 +262,7 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		lock.lock();
 		try {
 			// Rotate the keys to the current rotation period
-			Map<ContactId, TransportKeys> snapshot =
+			Map<ContactId, TransportKeys> snapshot = new HashMap<>();
-					new HashMap<ContactId, TransportKeys>();
 			for (Entry<ContactId, MutableTransportKeys> e : keys.entrySet())
 				snapshot.put(e.getKey(), e.getValue().snapshot());
 			RotationResult rotationResult = rotateKeys(snapshot, now);
@@ -311,8 +300,8 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 		private final Map<ContactId, TransportKeys> current, rotated;
 
 		private RotationResult() {
-			current = new HashMap<ContactId, TransportKeys>();
+			current = new HashMap<>();
-			rotated = new HashMap<ContactId, TransportKeys>();
+			rotated = new HashMap<>();
 		}
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/PoliteExecutorTest.java

@@ -24,16 +24,13 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newSingleThreadExecutor();
 		// Allow all the tasks to be delegated straight away
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, TASKS * 2);
-		final List<Integer> list = new Vector<Integer>();
+		List<Integer> list = new Vector<>();
-		final CountDownLatch latch = new CountDownLatch(TASKS);
+		CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			final int result = i;
+			int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
+				list.add(result);
-				public void run() {
+				latch.countDown();
-					list.add(result);
-					latch.countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -49,16 +46,13 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newSingleThreadExecutor();
 		// Allow two tasks to be delegated at a time
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, 2);
-		final List<Integer> list = new Vector<Integer>();
+		List<Integer> list = new Vector<>();
-		final CountDownLatch latch = new CountDownLatch(TASKS);
+		CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			final int result = i;
+			int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
+				list.add(result);
-				public void run() {
+				latch.countDown();
-					list.add(result);
-					latch.countDown();
-				}
 			});
 		}
 		// Wait for all the tasks to finish
@@ -73,23 +67,20 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newCachedThreadPool();
 		// Allow all the tasks to be delegated straight away
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, TASKS * 2);
-		final List<Integer> list = new Vector<Integer>();
+		List<Integer> list = new Vector<>();
-		final CountDownLatch[] latches = new CountDownLatch[TASKS];
+		CountDownLatch[] latches = new CountDownLatch[TASKS];
 		for (int i = 0; i < TASKS; i++) latches[i] = new CountDownLatch(1);
 		for (int i = 0; i < TASKS; i++) {
-			final int result = i;
+			int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
+				try {
-				public void run() {
+					// Each task waits for the next task, if any, to finish
-					try {
+					if (result < TASKS - 1) latches[result + 1].await();
-						// Each task waits for the next task, if any, to finish
+					list.add(result);
-						if (result < TASKS - 1) latches[result + 1].await();
+				} catch (InterruptedException e) {
-						list.add(result);
+					fail();
-					} catch (InterruptedException e) {
-						fail();
-					}
-					latches[result].countDown();
 				}
+				latches[result].countDown();
 			});
 		}
 		// Wait for all the tasks to finish
@@ -104,22 +95,19 @@ public class PoliteExecutorTest extends BrambleTestCase {
 		Executor delegate = Executors.newCachedThreadPool();
 		// Allow one task to be delegated at a time
 		PoliteExecutor polite = new PoliteExecutor(TAG, delegate, 1);
-		final List<Integer> list = new Vector<Integer>();
+		List<Integer> list = new Vector<>();
-		final CountDownLatch latch = new CountDownLatch(TASKS);
+		CountDownLatch latch = new CountDownLatch(TASKS);
 		for (int i = 0; i < TASKS; i++) {
-			final int result = i;
+			int result = i;
-			polite.execute(new Runnable() {
+			polite.execute(() -> {
-				@Override
+				try {
-				public void run() {
+					// Each task runs faster than the previous task
-					try {
+					Thread.sleep(TASKS - result);
-						// Each task runs faster than the previous task
+					list.add(result);
-						Thread.sleep(TASKS - result);
+				} catch (InterruptedException e) {
-						list.add(result);
+					fail();
-					} catch (InterruptedException e) {
-						fail();
-					}
-					latch.countDown();
 				}
+				latch.countDown();
 			});
 		}
 		// Wait for all the tasks to finish

bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java

@@ -83,9 +83,9 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test(expected = InvalidMessageException.class)
 	public void testRejectsTooShortMessage() throws Exception {
-		final byte[] invalidRaw = new byte[MESSAGE_HEADER_LENGTH];
+		byte[] invalidRaw = new byte[MESSAGE_HEADER_LENGTH];
 		// Use a mock message so the length of the raw message can be invalid
-		final Message invalidMessage = context.mock(Message.class);
+		Message invalidMessage = context.mock(Message.class);
 
 		context.checking(new Expectations() {{
 			oneOf(invalidMessage).getTimestamp();
@@ -101,8 +101,8 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test
 	public void testAcceptsMinLengthMessage() throws Exception {
-		final byte[] shortRaw = new byte[MESSAGE_HEADER_LENGTH + 1];
+		byte[] shortRaw = new byte[MESSAGE_HEADER_LENGTH + 1];
-		final Message shortMessage =
+		Message shortMessage =
 				new Message(messageId, groupId, timestamp, shortRaw);
 
 		context.checking(new Expectations() {{

bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java

@@ -76,8 +76,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testAddLocalMessage() throws Exception {
-		final boolean shared = true;
+		boolean shared = true;
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -95,7 +95,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testCreateMessage() throws Exception {
-		final byte[] bytes = expectToByteArray(list);
+		byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(messageFactory).createMessage(groupId, timestamp, bytes);
@@ -107,7 +107,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageAsList() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 
 		expectToList(true);
 		context.checking(new Expectations() {{
@@ -125,7 +125,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetGroupMetadataAsDictionary() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -145,7 +145,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionary() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -165,10 +165,9 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionaryMap() throws Exception {
-		final Map<MessageId, BdfDictionary> map =
+		Map<MessageId, BdfDictionary> map = new HashMap<>();
-				new HashMap<MessageId, BdfDictionary>();
 		map.put(messageId, dictionary);
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -188,14 +187,13 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessageMetadataAsDictionaryQuery() throws Exception {
-		final Map<MessageId, BdfDictionary> map =
+		Map<MessageId, BdfDictionary> map = new HashMap<>();
-				new HashMap<MessageId, BdfDictionary>();
 		map.put(messageId, dictionary);
-		final BdfDictionary query =
+		BdfDictionary query =
 				BdfDictionary.of(new BdfEntry("query", "me"));
-		final Metadata queryMetadata = new Metadata();
+		Metadata queryMetadata = new Metadata();
 		queryMetadata.put("query", getRandomBytes(42));
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -217,7 +215,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testMergeGroupMetadata() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -235,7 +233,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testMergeMessageMetadata() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -282,10 +280,10 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testSign() throws Exception {
-		final byte[] privateKey = getRandomBytes(42);
+		byte[] privateKey = getRandomBytes(42);
-		final byte[] signed = getRandomBytes(42);
+		byte[] signed = getRandomBytes(42);
 
-		final byte[] bytes = expectToByteArray(list);
+		byte[] bytes = expectToByteArray(list);
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).sign(label, bytes, privateKey);
 			will(returnValue(signed));
@@ -297,8 +295,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testVerifySignature() throws Exception {
-		final byte[] publicKey = getRandomBytes(42);
+		byte[] publicKey = getRandomBytes(42);
-		final byte[] bytes = expectToByteArray(list);
+		byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).verify(label, bytes, publicKey, rawMessage);
@@ -311,8 +309,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	@Test
 	public void testVerifyWrongSignature() throws Exception {
-		final byte[] publicKey = getRandomBytes(42);
+		byte[] publicKey = getRandomBytes(42);
-		final byte[] bytes = expectToByteArray(list);
+		byte[] bytes = expectToByteArray(list);
 
 		context.checking(new Expectations() {{
 			oneOf(cryptoComponent).verify(label, bytes, publicKey, rawMessage);
@@ -329,8 +327,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		}
 	}
 
-	private byte[] expectToByteArray(final BdfList list) throws Exception {
+	private byte[] expectToByteArray(BdfList list) throws Exception {
-		final BdfWriter bdfWriter = context.mock(BdfWriter.class);
+		BdfWriter bdfWriter = context.mock(BdfWriter.class);
 
 		context.checking(new Expectations() {{
 			oneOf(bdfWriterFactory)
@@ -341,8 +339,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		return new byte[0];
 	}
 
-	private void expectToList(final boolean eof) throws Exception {
+	private void expectToList(boolean eof) throws Exception {
-		final BdfReader bdfReader = context.mock(BdfReader.class);
+		BdfReader bdfReader = context.mock(BdfReader.class);
 
 		context.checking(new Expectations() {{
 			oneOf(bdfReaderFactory)

bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java

@@ -46,10 +46,10 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testAddContact() throws Exception {
-		final SecretKey master = getSecretKey();
+		SecretKey master = getSecretKey();
-		final long timestamp = 42;
+		long timestamp = 42;
-		final boolean alice = true;
+		boolean alice = true;
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -64,14 +64,13 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).endTransaction(txn);
 		}});
 
-		assertEquals(contactId, contactManager
+		assertEquals(contactId, contactManager.addContact(remote, local,
-				.addContact(remote, local, master, timestamp, alice, verified,
+				master, timestamp, alice, verified, active));
-						active));
 	}
 
 	@Test
 	public void testGetContact() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -86,8 +85,8 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGetContactByAuthor() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Collection<Contact> contacts = Collections.singleton(contact);
+		Collection<Contact> contacts = Collections.singleton(contact);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -102,7 +101,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test(expected = NoSuchContactException.class)
 	public void testGetContactByUnknownAuthor() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -116,8 +115,8 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test(expected = NoSuchContactException.class)
 	public void testGetContactByUnknownLocalAuthor() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Collection<Contact> contacts = Collections.singleton(contact);
+		Collection<Contact> contacts = Collections.singleton(contact);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -132,10 +131,9 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testActiveContacts() throws Exception {
 		Collection<Contact> activeContacts = Collections.singletonList(contact);
-		final Collection<Contact> contacts =
+		Collection<Contact> contacts = new ArrayList<>(activeContacts);
-				new ArrayList<Contact>(activeContacts);
 		contacts.add(new Contact(new ContactId(3), remote, local, true, false));
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
@@ -150,7 +148,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRemoveContact() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
 			will(returnValue(txn));
@@ -166,7 +164,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testSetContactActive() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 		context.checking(new Expectations() {{
 			oneOf(db).setContactActive(txn, contactId, active);
 		}});
@@ -176,7 +174,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testContactExists() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));

bramble-core/src/test/java/org/briarproject/bramble/crypto/EllipticCurvePerformanceTest.java

@@ -69,7 +69,7 @@ public class EllipticCurvePerformanceTest {
 		ECPublicKeyParameters public2 =
 				(ECPublicKeyParameters) keyPair2.getPublic();
 		// Time some ECDH key agreements
-		List<Long> samples = new ArrayList<Long>();
+		List<Long> samples = new ArrayList<>();
 		for (int i = 0; i < SAMPLES; i++) {
 			ECDHCBasicAgreement agreement = new ECDHCBasicAgreement();
 			long start = System.nanoTime();
@@ -79,7 +79,7 @@ public class EllipticCurvePerformanceTest {
 		}
 		long agreementMedian = median(samples);
 		// Time some signatures
-		List<byte[]> signatures = new ArrayList<byte[]>();
+		List<byte[]> signatures = new ArrayList<>();
 		samples.clear();
 		for (int i = 0; i < SAMPLES; i++) {
 			Digest digest = new Blake2sDigest();

bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java

@@ -145,7 +145,7 @@ public class KeyDerivationTest extends BrambleTestCase {
 	}
 
 	private void assertAllDifferent(TransportKeys... transportKeys) {
-		List<SecretKey> secretKeys = new ArrayList<SecretKey>();
+		List<SecretKey> secretKeys = new ArrayList<>();
 		for (TransportKeys k : transportKeys) {
 			secretKeys.add(k.getPreviousIncomingKeys().getTagKey());
 			secretKeys.add(k.getPreviousIncomingKeys().getHeaderKey());
@@ -160,7 +160,7 @@ public class KeyDerivationTest extends BrambleTestCase {
 	}
 
 	private void assertAllDifferent(List<SecretKey> keys) {
-		Set<Bytes> set = new HashSet<Bytes>();
+		Set<Bytes> set = new HashSet<>();
 		for (SecretKey k : keys) assertTrue(set.add(new Bytes(k.getBytes())));
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/crypto/TagEncodingTest.java

@@ -28,7 +28,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testKeyAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<Bytes>();
+		Set<Bytes> set = new HashSet<>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			SecretKey tagKey = TestUtils.getSecretKey();
@@ -39,7 +39,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testProtocolVersionAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<Bytes>();
+		Set<Bytes> set = new HashSet<>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			crypto.encodeTag(tag, tagKey, PROTOCOL_VERSION + i, streamNumber);
@@ -49,7 +49,7 @@ public class TagEncodingTest extends BrambleTestCase {
 
 	@Test
 	public void testStreamNumberAffectsTag() throws Exception {
-		Set<Bytes> set = new HashSet<Bytes>();
+		Set<Bytes> set = new HashSet<>();
 		for (int i = 0; i < 100; i++) {
 			byte[] tag = new byte[TAG_LENGTH];
 			crypto.encodeTag(tag, tagKey, PROTOCOL_VERSION, streamNumber + i);

bramble-core/src/test/java/org/briarproject/bramble/data/BdfWriterImplTest.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.data;
 
 import org.briarproject.bramble.test.BrambleTestCase;
-import org.briarproject.bramble.test.TestUtils;
 import org.briarproject.bramble.util.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -155,7 +154,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testWriteList() throws IOException {
-		List<Object> l = new ArrayList<Object>();
+		List<Object> l = new ArrayList<>();
 		for (int i = 0; i < 3; i++) l.add(i);
 		w.writeList(l);
 		// LIST tag, elements as integers, END tag
@@ -164,7 +163,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testListCanContainNull() throws IOException {
-		List<Object> l = new ArrayList<Object>();
+		List<Object> l = new ArrayList<>();
 		l.add(1);
 		l.add(null);
 		l.add(NULL_VALUE);
@@ -177,7 +176,7 @@ public class BdfWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testWriteDictionary() throws IOException {
 		// Use LinkedHashMap to get predictable iteration order
-		Map<String, Object> m = new LinkedHashMap<String, Object>();
+		Map<String, Object> m = new LinkedHashMap<>();
 		for (int i = 0; i < 4; i++) m.put(String.valueOf(i), i);
 		w.writeDictionary(m);
 		// DICTIONARY tag, keys as strings and values as integers, END tag
@@ -216,12 +215,12 @@ public class BdfWriterImplTest extends BrambleTestCase {
 
 	@Test
 	public void testWriteNestedDictionariesAndLists() throws IOException {
-		Map<String, Object> inner = new LinkedHashMap<String, Object>();
+		Map<String, Object> inner = new LinkedHashMap<>();
 		inner.put("bar", new byte[0]);
-		List<Object> list = new ArrayList<Object>();
+		List<Object> list = new ArrayList<>();
 		list.add(1);
 		list.add(inner);
-		Map<String, Object> outer = new LinkedHashMap<String, Object>();
+		Map<String, Object> outer = new LinkedHashMap<>();
 		outer.put("foo", list);
 		w.writeDictionary(outer);
 		// DICTIONARY tag, "foo" as string, LIST tag, 1 as integer,

bramble-core/src/test/java/org/briarproject/bramble/data/MetadataEncoderParserIntegrationTest.java

@@ -99,7 +99,7 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testList() throws FormatException {
-		List<Long> l = new ArrayList<Long>(4);
+		List<Long> l = new ArrayList<>(4);
 		l.add(42L);
 		l.add(1337L);
 		l.add(Long.MIN_VALUE);
@@ -114,7 +114,7 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testDictionary() throws FormatException {
-		Map<String, Boolean> m = new HashMap<String, Boolean>();
+		Map<String, Boolean> m = new HashMap<>();
 		m.put("1", true);
 		m.put("2", false);
 
@@ -130,19 +130,19 @@ public class MetadataEncoderParserIntegrationTest extends BrambleTestCase {
 
 	@Test
 	public void testComplexDictionary() throws FormatException {
-		Map<String, List> m = new HashMap<String, List>();
+		Map<String, List> m = new HashMap<>();
-		List<String> one = new ArrayList<String>(3);
+		List<String> one = new ArrayList<>(3);
 		one.add("\uFDD0");
 		one.add("\uFDD1");
 		one.add("\uFDD2");
 		m.put("One", one);
-		List<String> two = new ArrayList<String>(2);
+		List<String> two = new ArrayList<>(2);
 		two.add("\u0080");
 		two.add("\uD800\uDC00");
 		m.put("Two", two);
 		d.put("test", m);
 
-		Map<String, Boolean> m2 = new HashMap<String, Boolean>();
+		Map<String, Boolean> m2 = new HashMap<>();
 		m2.put("should be true", true);
 		d.put("another test", m2);
 

bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java

@@ -323,7 +323,7 @@ public class BasicH2Test extends BrambleTestCase {
 
 	private List<String> getNames() throws SQLException {
 		String sql = "SELECT name FROM foo ORDER BY uniqueId";
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		try {
 			PreparedStatement ps = connection.prepareStatement(sql);
 			ResultSet rs = ps.executeQuery();

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java

@@ -120,18 +120,18 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	private DatabaseComponent createDatabaseComponent(Database<Object> database,
 			EventBus eventBus, ShutdownManager shutdown) {
-		return new DatabaseComponentImpl<Object>(database, Object.class,
+		return new DatabaseComponentImpl<>(database, Object.class, eventBus,
-				eventBus, shutdown);
+				shutdown);
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testSimpleCalls() throws Exception {
-		final int shutdownHandle = 12345;
+		int shutdownHandle = 12345;
 		Mockery context = new Mockery();
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// open()
 			oneOf(database).open();
@@ -230,9 +230,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -260,9 +260,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testAddLocalMessage() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -303,9 +303,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the contact is in the DB (which it's not)
 			exactly(18).of(database).startTransaction();
@@ -509,9 +509,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the pseudonym is in the DB (which it's not)
 			exactly(3).of(database).startTransaction();
@@ -561,9 +561,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the group is in the DB (which it's not)
 			exactly(8).of(database).startTransaction();
@@ -666,9 +666,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// Check whether the message is in the DB (which it's not)
 			exactly(11).of(database).startTransaction();
@@ -801,9 +801,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -896,13 +896,13 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGenerateAck() throws Exception {
-		final Collection<MessageId> messagesToAck = Arrays.asList(messageId,
+		Collection<MessageId> messagesToAck = Arrays.asList(messageId,
 				messageId1);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -931,14 +931,14 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGenerateBatch() throws Exception {
-		final byte[] raw1 = new byte[size];
+		byte[] raw1 = new byte[size];
-		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		final Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Collection<byte[]> messages = Arrays.asList(raw, raw1);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -975,13 +975,13 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGenerateOffer() throws Exception {
-		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1013,13 +1013,13 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGenerateRequest() throws Exception {
-		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1048,14 +1048,14 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testGenerateRequestedBatch() throws Exception {
-		final byte[] raw1 = new byte[size];
+		byte[] raw1 = new byte[size];
-		final Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
+		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		final Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Collection<byte[]> messages = Arrays.asList(raw, raw1);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1095,9 +1095,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testReceiveAck() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1128,9 +1128,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testReceiveMessage() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1183,9 +1183,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testReceiveDuplicateMessage() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1220,9 +1220,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testReceiveMessageWithoutVisibleGroup() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1248,14 +1248,14 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testReceiveOffer() throws Exception {
-		final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId1 = new MessageId(TestUtils.getRandomId());
-		final MessageId messageId2 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId2 = new MessageId(TestUtils.getRandomId());
-		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1304,9 +1304,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testReceiveRequest() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1338,9 +1338,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testChangingVisibilityCallsListeners() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1379,9 +1379,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
@@ -1409,14 +1409,14 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testTransportKeys() throws Exception {
-		final TransportKeys transportKeys = createTransportKeys();
+		TransportKeys transportKeys = createTransportKeys();
-		final Map<ContactId, TransportKeys> keys = Collections.singletonMap(
+		Map<ContactId, TransportKeys> keys = Collections.singletonMap(
 				contactId, transportKeys);
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -1472,19 +1472,19 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 
 	@Test
 	public void testMergeSettings() throws Exception {
-		final Settings before = new Settings();
+		Settings before = new Settings();
 		before.put("foo", "bar");
 		before.put("baz", "bam");
-		final Settings update = new Settings();
+		Settings update = new Settings();
 		update.put("baz", "qux");
-		final Settings merged = new Settings();
+		Settings merged = new Settings();
 		merged.put("foo", "bar");
 		merged.put("baz", "qux");
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			// startTransaction()
 			oneOf(database).startTransaction();
@@ -1547,9 +1547,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
@@ -1572,9 +1572,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testCannotAddLocalIdentityAsContact() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
@@ -1607,9 +1607,9 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	public void testCannotAddDuplicateContact() throws Exception {
 		Mockery context = new Mockery();
 		@SuppressWarnings("unchecked")
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
@@ -1643,12 +1643,12 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testMessageDependencies() throws Exception {
-		final int shutdownHandle = 12345;
+		int shutdownHandle = 12345;
 		Mockery context = new Mockery();
-		final Database<Object> database = context.mock(Database.class);
+		Database<Object> database = context.mock(Database.class);
-		final ShutdownManager shutdown = context.mock(ShutdownManager.class);
+		ShutdownManager shutdown = context.mock(ShutdownManager.class);
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
-		final MessageId messageId2 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId2 = new MessageId(TestUtils.getRandomId());
 		context.checking(new Expectations() {{
 			// open()
 			oneOf(database).open();
@@ -1703,7 +1703,7 @@ public class DatabaseComponentImplTest extends BrambleTestCase {
 		Transaction transaction = db.startTransaction(false);
 		try {
 			db.addLocalMessage(transaction, message, metadata, true);
-			Collection<MessageId> dependencies = new ArrayList<MessageId>(2);
+			Collection<MessageId> dependencies = new ArrayList<>(2);
 			dependencies.add(messageId1);
 			dependencies.add(messageId2);
 			db.addMessageDependencies(transaction, message, dependencies);

bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java

@@ -464,28 +464,25 @@ public class H2DatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testCloseWaitsForCommit() throws Exception {
-		final CountDownLatch closing = new CountDownLatch(1);
+		CountDownLatch closing = new CountDownLatch(1);
-		final CountDownLatch closed = new CountDownLatch(1);
+		CountDownLatch closed = new CountDownLatch(1);
-		final AtomicBoolean transactionFinished = new AtomicBoolean(false);
+		AtomicBoolean transactionFinished = new AtomicBoolean(false);
-		final AtomicBoolean error = new AtomicBoolean(false);
+		AtomicBoolean error = new AtomicBoolean(false);
-		final Database<Connection> db = open(false);
+		Database<Connection> db = open(false);
 
 		// Start a transaction
 		Connection txn = db.startTransaction();
 		// In another thread, close the database
-		Thread close = new Thread() {
+		Thread close = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				closing.countDown();
-				try {
+				db.close();
-					closing.countDown();
+				if (!transactionFinished.get()) error.set(true);
-					db.close();
+				closed.countDown();
-					if (!transactionFinished.get()) error.set(true);
+			} catch (Exception e) {
-					closed.countDown();
+				error.set(true);
-				} catch (Exception e) {
-					error.set(true);
-				}
 			}
-		};
+		});
 		close.start();
 		closing.await();
 		// Do whatever the transaction needs to do
@@ -501,28 +498,25 @@ public class H2DatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testCloseWaitsForAbort() throws Exception {
-		final CountDownLatch closing = new CountDownLatch(1);
+		CountDownLatch closing = new CountDownLatch(1);
-		final CountDownLatch closed = new CountDownLatch(1);
+		CountDownLatch closed = new CountDownLatch(1);
-		final AtomicBoolean transactionFinished = new AtomicBoolean(false);
+		AtomicBoolean transactionFinished = new AtomicBoolean(false);
-		final AtomicBoolean error = new AtomicBoolean(false);
+		AtomicBoolean error = new AtomicBoolean(false);
-		final Database<Connection> db = open(false);
+		Database<Connection> db = open(false);
 
 		// Start a transaction
 		Connection txn = db.startTransaction();
 		// In another thread, close the database
-		Thread close = new Thread() {
+		Thread close = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				closing.countDown();
-				try {
+				db.close();
-					closing.countDown();
+				if (!transactionFinished.get()) error.set(true);
-					db.close();
+				closed.countDown();
-					if (!transactionFinished.get()) error.set(true);
+			} catch (Exception e) {
-					closed.countDown();
+				error.set(true);
-				} catch (Exception e) {
-					error.set(true);
-				}
 			}
-		};
+		});
 		close.start();
 		closing.await();
 		// Do whatever the transaction needs to do
@@ -870,7 +864,7 @@ public class H2DatabaseTest extends BrambleTestCase {
 		assertEquals(0, db.countOfferedMessages(txn, contactId));
 
 		// Add some offered messages and count them
-		List<MessageId> ids = new ArrayList<MessageId>();
+		List<MessageId> ids = new ArrayList<>();
 		for (int i = 0; i < 10; i++) {
 			MessageId m = new MessageId(TestUtils.getRandomId());
 			db.addOfferedMessage(txn, contactId, m);

bramble-core/src/test/java/org/briarproject/bramble/db/LockFairnessTest.java

@@ -17,56 +17,50 @@ public class LockFairnessTest extends BrambleTestCase {
 	@Test
 	public void testReadersCanShareTheLock() throws Exception {
 		// Use a fair lock
-		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
+		ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
-		final CountDownLatch firstReaderHasLock = new CountDownLatch(1);
+		CountDownLatch firstReaderHasLock = new CountDownLatch(1);
-		final CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
+		CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
-		final CountDownLatch secondReaderHasLock = new CountDownLatch(1);
+		CountDownLatch secondReaderHasLock = new CountDownLatch(1);
-		final CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
+		CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
 		// First reader
-		Thread first = new Thread() {
+		Thread first = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				// Acquire the lock
+				lock.readLock().lock();
 				try {
-					// Acquire the lock
+					// Allow the second reader to acquire the lock
-					lock.readLock().lock();
+					firstReaderHasLock.countDown();
-					try {
+					// Wait for the second reader to acquire the lock
-						// Allow the second reader to acquire the lock
+					assertTrue(secondReaderHasLock.await(10, SECONDS));
-						firstReaderHasLock.countDown();
+				} finally {
-						// Wait for the second reader to acquire the lock
+					// Release the lock
-						assertTrue(secondReaderHasLock.await(10, SECONDS));
+					lock.readLock().unlock();
-					} finally {
-						// Release the lock
-						lock.readLock().unlock();
-					}
-				} catch (InterruptedException e) {
-					fail();
 				}
-				firstReaderHasFinished.countDown();
+			} catch (InterruptedException e) {
+				fail();
 			}
-		};
+			firstReaderHasFinished.countDown();
+		});
 		first.start();
 		// Second reader
-		Thread second = new Thread() {
+		Thread second = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				// Wait for the first reader to acquire the lock
+				assertTrue(firstReaderHasLock.await(10, SECONDS));
+				// Acquire the lock
+				lock.readLock().lock();
 				try {
-					// Wait for the first reader to acquire the lock
+					// Allow the first reader to release the lock
-					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					secondReaderHasLock.countDown();
-					// Acquire the lock
+				} finally {
-					lock.readLock().lock();
+					// Release the lock
-					try {
+					lock.readLock().unlock();
-						// Allow the first reader to release the lock
-						secondReaderHasLock.countDown();
-					} finally {
-						// Release the lock
-						lock.readLock().unlock();
-					}
-				} catch (InterruptedException e) {
-					fail();
 				}
-				secondReaderHasFinished.countDown();
+			} catch (InterruptedException e) {
+				fail();
 			}
-		};
+			secondReaderHasFinished.countDown();
+		});
 		second.start();
 		// Wait for both readers to finish
 		assertTrue(firstReaderHasFinished.await(10, SECONDS));
@@ -76,86 +70,77 @@ public class LockFairnessTest extends BrambleTestCase {
 	@Test
 	public void testWritersDoNotStarve() throws Exception {
 		// Use a fair lock
-		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
+		ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
-		final CountDownLatch firstReaderHasLock = new CountDownLatch(1);
+		CountDownLatch firstReaderHasLock = new CountDownLatch(1);
-		final CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
+		CountDownLatch firstReaderHasFinished = new CountDownLatch(1);
-		final CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
+		CountDownLatch secondReaderHasFinished = new CountDownLatch(1);
-		final CountDownLatch writerHasFinished = new CountDownLatch(1);
+		CountDownLatch writerHasFinished = new CountDownLatch(1);
-		final AtomicBoolean secondReaderHasHeldLock = new AtomicBoolean(false);
+		AtomicBoolean secondReaderHasHeldLock = new AtomicBoolean(false);
-		final AtomicBoolean writerHasHeldLock = new AtomicBoolean(false);
+		AtomicBoolean writerHasHeldLock = new AtomicBoolean(false);
 		// First reader
-		Thread first = new Thread() {
+		Thread first = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				// Acquire the lock
+				lock.readLock().lock();
 				try {
-					// Acquire the lock
+					// Allow the other threads to acquire the lock
-					lock.readLock().lock();
+					firstReaderHasLock.countDown();
-					try {
+					// Wait for both other threads to wait for the lock
-						// Allow the other threads to acquire the lock
+					while (lock.getQueueLength() < 2) Thread.sleep(10);
-						firstReaderHasLock.countDown();
+					// No other thread should have acquired the lock
-						// Wait for both other threads to wait for the lock
+					assertFalse(secondReaderHasHeldLock.get());
-						while (lock.getQueueLength() < 2) Thread.sleep(10);
+					assertFalse(writerHasHeldLock.get());
-						// No other thread should have acquired the lock
+				} finally {
-						assertFalse(secondReaderHasHeldLock.get());
+					// Release the lock
-						assertFalse(writerHasHeldLock.get());
+					lock.readLock().unlock();
-					} finally {
-						// Release the lock
-						lock.readLock().unlock();
-					}
-				} catch (InterruptedException e) {
-					fail();
 				}
-				firstReaderHasFinished.countDown();
+			} catch (InterruptedException e) {
+				fail();
 			}
-		};
+			firstReaderHasFinished.countDown();
+		});
 		first.start();
 		// Writer
-		Thread writer = new Thread() {
+		Thread writer = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				// Wait for the first reader to acquire the lock
+				assertTrue(firstReaderHasLock.await(10, SECONDS));
+				// Acquire the lock
+				lock.writeLock().lock();
 				try {
-					// Wait for the first reader to acquire the lock
+					writerHasHeldLock.set(true);
-					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					// The second reader should not overtake the writer
-					// Acquire the lock
+					assertFalse(secondReaderHasHeldLock.get());
-					lock.writeLock().lock();
+				} finally {
-					try {
+					lock.writeLock().unlock();
-						writerHasHeldLock.set(true);
-						// The second reader should not overtake the writer
-						assertFalse(secondReaderHasHeldLock.get());
-					} finally {
-						lock.writeLock().unlock();
-					}
-				} catch (InterruptedException e) {
-					fail();
 				}
-				writerHasFinished.countDown();
+			} catch (InterruptedException e) {
+				fail();
 			}
-		};
+			writerHasFinished.countDown();
+		});
 		writer.start();
 		// Second reader
-		Thread second = new Thread() {
+		Thread second = new Thread(() -> {
-			@Override
+			try {
-			public void run() {
+				// Wait for the first reader to acquire the lock
+				assertTrue(firstReaderHasLock.await(10, SECONDS));
+				// Wait for the writer to wait for the lock
+				while (lock.getQueueLength() < 1) Thread.sleep(10);
+				// Acquire the lock
+				lock.readLock().lock();
 				try {
-					// Wait for the first reader to acquire the lock
+					secondReaderHasHeldLock.set(true);
-					assertTrue(firstReaderHasLock.await(10, SECONDS));
+					// The second reader should not overtake the writer
-					// Wait for the writer to wait for the lock
+					assertTrue(writerHasHeldLock.get());
-					while (lock.getQueueLength() < 1) Thread.sleep(10);
+				} finally {
-					// Acquire the lock
+					lock.readLock().unlock();
-					lock.readLock().lock();
-					try {
-						secondReaderHasHeldLock.set(true);
-						// The second reader should not overtake the writer
-						assertTrue(writerHasHeldLock.get());
-					} finally {
-						lock.readLock().unlock();
-					}
-				} catch (InterruptedException e) {
-					fail();
 				}
-				secondReaderHasFinished.countDown();
+			} catch (InterruptedException e) {
+				fail();
 			}
-		};
+			secondReaderHasFinished.countDown();
+		});
 		second.start();
 		// Wait for all the threads to finish
 		assertTrue(firstReaderHasFinished.await(10, SECONDS));

bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java

@@ -80,8 +80,8 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGetAuthorStatus() throws DbException {
-		final AuthorId authorId = new AuthorId(TestUtils.getRandomId());
+		AuthorId authorId = new AuthorId(TestUtils.getRandomId());
-		final Collection<Contact> contacts = new ArrayList<Contact>();
+		Collection<Contact> contacts = new ArrayList<>();
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -125,8 +125,8 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 				identityManager.getAuthorStatus(localAuthor.getId()));
 	}
 
-	private void checkAuthorStatusContext(final AuthorId authorId,
+	private void checkAuthorStatusContext(AuthorId authorId,
-			final Collection<Contact> contacts) throws DbException {
+			Collection<Contact> contacts) throws DbException {
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));

bramble-core/src/test/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocolTest.java

@@ -65,11 +65,11 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test
 	public void testAliceProtocol() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		SecretKey sharedSecret = TestUtils.getSecretKey();
-		final SecretKey masterSecret = TestUtils.getSecretKey();
+		SecretKey masterSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -129,11 +129,11 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test
 	public void testBobProtocol() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		SecretKey sharedSecret = TestUtils.getSecretKey();
-		final SecretKey masterSecret = TestUtils.getSecretKey();
+		SecretKey masterSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -192,9 +192,9 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testAliceProtocolAbortOnBadKey() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -233,9 +233,9 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testBobProtocolAbortOnBadKey() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -270,10 +270,10 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testAliceProtocolAbortOnBadConfirm() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(BOB_COMMIT, null);
+		Payload theirPayload = new Payload(BOB_COMMIT, null);
-		final Payload ourPayload = new Payload(ALICE_COMMIT, null);
+		Payload ourPayload = new Payload(ALICE_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		SecretKey sharedSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,
@@ -335,10 +335,10 @@ public class KeyAgreementProtocolTest extends BrambleTestCase {
 	@Test(expected = AbortException.class)
 	public void testBobProtocolAbortOnBadConfirm() throws Exception {
 		// set up
-		final Payload theirPayload = new Payload(ALICE_COMMIT, null);
+		Payload theirPayload = new Payload(ALICE_COMMIT, null);
-		final Payload ourPayload = new Payload(BOB_COMMIT, null);
+		Payload ourPayload = new Payload(BOB_COMMIT, null);
-		final KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
+		KeyPair ourKeyPair = new KeyPair(ourPubKey, null);
-		final SecretKey sharedSecret = TestUtils.getSecretKey();
+		SecretKey sharedSecret = TestUtils.getSecretKey();
 
 		KeyAgreementProtocol protocol =
 				new KeyAgreementProtocol(callbacks, crypto, payloadEncoder,

bramble-core/src/test/java/org/briarproject/bramble/lifecycle/ShutdownManagerImplTest.java

@@ -15,13 +15,9 @@ public class ShutdownManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testAddAndRemove() {
 		ShutdownManager s = createShutdownManager();
-		Set<Integer> handles = new HashSet<Integer>();
+		Set<Integer> handles = new HashSet<>();
 		for (int i = 0; i < 100; i++) {
-			int handle = s.addShutdownHook(new Runnable() {
+			int handle = s.addShutdownHook(() -> {});
-				@Override
-				public void run() {
-				}
-			});
 			// The handles should all be distinct
 			assertTrue(handles.add(handle));
 		}

bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java

@@ -35,7 +35,7 @@ public class ConnectionRegistryImplTest extends BrambleTestCase {
 	@Test
 	public void testRegisterAndUnregister() {
 		Mockery context = new Mockery();
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
 		context.checking(new Expectations() {{
 			exactly(5).of(eventBus).broadcast(with(any(
 					ConnectionOpenedEvent.class)));

bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java

@@ -30,36 +30,36 @@ public class PluginManagerImplTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor ioExecutor = Executors.newSingleThreadExecutor();
+		Executor ioExecutor = Executors.newSingleThreadExecutor();
-		final EventBus eventBus = context.mock(EventBus.class);
+		EventBus eventBus = context.mock(EventBus.class);
-		final PluginConfig pluginConfig = context.mock(PluginConfig.class);
+		PluginConfig pluginConfig = context.mock(PluginConfig.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final SettingsManager settingsManager =
+		SettingsManager settingsManager =
 				context.mock(SettingsManager.class);
-		final TransportPropertyManager transportPropertyManager =
+		TransportPropertyManager transportPropertyManager =
 				context.mock(TransportPropertyManager.class);
-		final UiCallback uiCallback = context.mock(UiCallback.class);
+		UiCallback uiCallback = context.mock(UiCallback.class);
 
 		// Two simplex plugin factories: both create plugins, one fails to start
-		final SimplexPluginFactory simplexFactory =
+		SimplexPluginFactory simplexFactory =
 				context.mock(SimplexPluginFactory.class);
-		final SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
+		SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
-		final TransportId simplexId = new TransportId("simplex");
+		TransportId simplexId = new TransportId("simplex");
-		final SimplexPluginFactory simplexFailFactory =
+		SimplexPluginFactory simplexFailFactory =
 				context.mock(SimplexPluginFactory.class, "simplexFailFactory");
-		final SimplexPlugin simplexFailPlugin =
+		SimplexPlugin simplexFailPlugin =
 				context.mock(SimplexPlugin.class, "simplexFailPlugin");
-		final TransportId simplexFailId = new TransportId("simplex1");
+		TransportId simplexFailId = new TransportId("simplex1");
 
 		// Two duplex plugin factories: one creates a plugin, the other fails
-		final DuplexPluginFactory duplexFactory =
+		DuplexPluginFactory duplexFactory =
 				context.mock(DuplexPluginFactory.class);
-		final DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
+		DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
-		final TransportId duplexId = new TransportId("duplex");
+		TransportId duplexId = new TransportId("duplex");
-		final DuplexPluginFactory duplexFailFactory =
+		DuplexPluginFactory duplexFailFactory =
 				context.mock(DuplexPluginFactory.class, "duplexFailFactory");
-		final TransportId duplexFailId = new TransportId("duplex1");
+		TransportId duplexFailId = new TransportId("duplex1");
 
 		context.checking(new Expectations() {{
 			allowing(simplexPlugin).getId();

bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerTest.java

@@ -42,35 +42,35 @@ public class PollerTest extends BrambleTestCase {
 	public void testConnectOnContactStatusChanged() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		final Executor ioExecutor = new ImmediateExecutor();
+		Executor ioExecutor = new ImmediateExecutor();
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final ConnectionRegistry connectionRegistry =
+		ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		final PluginManager pluginManager = context.mock(PluginManager.class);
+		PluginManager pluginManager = context.mock(PluginManager.class);
-		final SecureRandom random = context.mock(SecureRandom.class);
+		SecureRandom random = context.mock(SecureRandom.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
 		// Two simplex plugins: one supports polling, the other doesn't
-		final SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
+		SimplexPlugin simplexPlugin = context.mock(SimplexPlugin.class);
-		final SimplexPlugin simplexPlugin1 =
+		SimplexPlugin simplexPlugin1 =
 				context.mock(SimplexPlugin.class, "simplexPlugin1");
-		final TransportId simplexId1 = new TransportId("simplex1");
+		TransportId simplexId1 = new TransportId("simplex1");
-		final List<SimplexPlugin> simplexPlugins = Arrays.asList(simplexPlugin,
+		List<SimplexPlugin> simplexPlugins = Arrays.asList(simplexPlugin,
 				simplexPlugin1);
-		final TransportConnectionWriter simplexWriter =
+		TransportConnectionWriter simplexWriter =
 				context.mock(TransportConnectionWriter.class);
 
 		// Two duplex plugins: one supports polling, the other doesn't
-		final DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
+		DuplexPlugin duplexPlugin = context.mock(DuplexPlugin.class);
-		final TransportId duplexId = new TransportId("duplex");
+		TransportId duplexId = new TransportId("duplex");
-		final DuplexPlugin duplexPlugin1 =
+		DuplexPlugin duplexPlugin1 =
 				context.mock(DuplexPlugin.class, "duplexPlugin1");
-		final List<DuplexPlugin> duplexPlugins = Arrays.asList(duplexPlugin,
+		List<DuplexPlugin> duplexPlugins = Arrays.asList(duplexPlugin,
 				duplexPlugin1);
-		final DuplexTransportConnection duplexConnection =
+		DuplexTransportConnection duplexConnection =
 				context.mock(DuplexTransportConnection.class);
 
 		context.checking(new Expectations() {{
@@ -129,20 +129,20 @@ public class PollerTest extends BrambleTestCase {
 			throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		final Executor ioExecutor = new ImmediateExecutor();
+		Executor ioExecutor = new ImmediateExecutor();
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final ConnectionRegistry connectionRegistry =
+		ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		final PluginManager pluginManager = context.mock(PluginManager.class);
+		PluginManager pluginManager = context.mock(PluginManager.class);
-		final SecureRandom random = context.mock(SecureRandom.class);
+		SecureRandom random = context.mock(SecureRandom.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		final TransportId transportId = new TransportId("id");
+		TransportId transportId = new TransportId("id");
-		final DuplexTransportConnection duplexConnection =
+		DuplexTransportConnection duplexConnection =
 				context.mock(DuplexTransportConnection.class);
 
 		context.checking(new Expectations() {{
@@ -194,19 +194,19 @@ public class PollerTest extends BrambleTestCase {
 	public void testRescheduleOnConnectionOpened() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		final Executor ioExecutor = new ImmediateExecutor();
+		Executor ioExecutor = new ImmediateExecutor();
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final ConnectionRegistry connectionRegistry =
+		ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		final PluginManager pluginManager = context.mock(PluginManager.class);
+		PluginManager pluginManager = context.mock(PluginManager.class);
-		final SecureRandom random = context.mock(SecureRandom.class);
+		SecureRandom random = context.mock(SecureRandom.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		final TransportId transportId = new TransportId("id");
+		TransportId transportId = new TransportId("id");
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
@@ -239,19 +239,19 @@ public class PollerTest extends BrambleTestCase {
 	public void testRescheduleDoesNotReplaceEarlierTask() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		final Executor ioExecutor = new ImmediateExecutor();
+		Executor ioExecutor = new ImmediateExecutor();
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final ConnectionRegistry connectionRegistry =
+		ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		final PluginManager pluginManager = context.mock(PluginManager.class);
+		PluginManager pluginManager = context.mock(PluginManager.class);
-		final SecureRandom random = context.mock(SecureRandom.class);
+		SecureRandom random = context.mock(SecureRandom.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final DuplexPlugin plugin = context.mock(DuplexPlugin.class);
+		DuplexPlugin plugin = context.mock(DuplexPlugin.class);
-		final TransportId transportId = new TransportId("id");
+		TransportId transportId = new TransportId("id");
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();
@@ -299,20 +299,20 @@ public class PollerTest extends BrambleTestCase {
 	public void testPollOnTransportEnabled() throws Exception {
 		Mockery context = new Mockery();
 		context.setImposteriser(ClassImposteriser.INSTANCE);
-		final Executor ioExecutor = new ImmediateExecutor();
+		Executor ioExecutor = new ImmediateExecutor();
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final ConnectionManager connectionManager =
+		ConnectionManager connectionManager =
 				context.mock(ConnectionManager.class);
-		final ConnectionRegistry connectionRegistry =
+		ConnectionRegistry connectionRegistry =
 				context.mock(ConnectionRegistry.class);
-		final PluginManager pluginManager = context.mock(PluginManager.class);
+		PluginManager pluginManager = context.mock(PluginManager.class);
-		final SecureRandom random = context.mock(SecureRandom.class);
+		SecureRandom random = context.mock(SecureRandom.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final Plugin plugin = context.mock(Plugin.class);
+		Plugin plugin = context.mock(Plugin.class);
-		final TransportId transportId = new TransportId("id");
+		TransportId transportId = new TransportId("id");
-		final List<ContactId> connected = Collections.singletonList(contactId);
+		List<ContactId> connected = Collections.singletonList(contactId);
 
 		context.checking(new Expectations() {{
 			allowing(plugin).getId();

bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java

@@ -145,11 +145,11 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		assertEquals(2, split.length);
 		String addrString = split[0];
 		// Listen on the same interface as the plugin
-		final ServerSocket ss = new ServerSocket();
+		ServerSocket ss = new ServerSocket();
 		ss.bind(new InetSocketAddress(addrString, 0), 10);
 		int port = ss.getLocalPort();
-		final CountDownLatch latch = new CountDownLatch(1);
+		CountDownLatch latch = new CountDownLatch(1);
-		final AtomicBoolean error = new AtomicBoolean(false);
+		AtomicBoolean error = new AtomicBoolean(false);
 		new Thread() {
 			@Override
 			public void run() {
@@ -194,8 +194,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
 				plugin.createKeyAgreementListener(new byte[COMMIT_LENGTH]);
 		assertNotNull(kal);
 		Callable<KeyAgreementConnection> c = kal.listen();
-		FutureTask<KeyAgreementConnection> f =
+		FutureTask<KeyAgreementConnection> f = new FutureTask<>(c);
-				new FutureTask<KeyAgreementConnection>(c);
 		new Thread(f).start();
 		// The plugin should have bound a socket and stored the port number
 		BdfList descriptor = kal.getDescriptor();
@@ -240,10 +239,10 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		assertEquals(2, split.length);
 		String addrString = split[0];
 		// Listen on the same interface as the plugin
-		final ServerSocket ss = new ServerSocket();
+		ServerSocket ss = new ServerSocket();
 		ss.bind(new InetSocketAddress(addrString, 0), 10);
-		final CountDownLatch latch = new CountDownLatch(1);
+		CountDownLatch latch = new CountDownLatch(1);
-		final AtomicBoolean error = new AtomicBoolean(false);
+		AtomicBoolean error = new AtomicBoolean(false);
 		new Thread() {
 			@Override
 			public void run() {
@@ -291,7 +290,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
 	private static class Callback implements DuplexPluginCallback {
 
 		private final Map<ContactId, TransportProperties> remote =
-				new Hashtable<ContactId, TransportProperties>();
+				new Hashtable<>();
 		private final CountDownLatch propertiesLatch = new CountDownLatch(1);
 		private final CountDownLatch connectionsLatch = new CountDownLatch(1);
 		private final TransportProperties local = new TransportProperties();

bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java

@@ -87,11 +87,11 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testCreatesGroupsAtStartup() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Contact contact1 = getContact(true);
+		Contact contact1 = getContact(true);
-		final Contact contact2 = getContact(true);
+		Contact contact2 = getContact(true);
-		final List<Contact> contacts = Arrays.asList(contact1, contact2);
+		List<Contact> contacts = Arrays.asList(contact1, contact2);
-		final Group contactGroup1 = getGroup(), contactGroup2 = getGroup();
+		Group contactGroup1 = getGroup(), contactGroup2 = getGroup();
 
 		context.checking(new Expectations() {{
 			oneOf(db).addGroup(txn, localGroup);
@@ -124,9 +124,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testCreatesGroupWhenAddingContact() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Contact contact = getContact(true);
+		Contact contact = getContact(true);
-		final Group contactGroup = getGroup();
+		Group contactGroup = getGroup();
 
 		context.checking(new Expectations() {{
 			// Create the group and share it with the contact
@@ -151,9 +151,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRemovesGroupWhenRemovingContact() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Contact contact = getContact(true);
+		Contact contact = getContact(true);
-		final Group contactGroup = getGroup();
+		Group contactGroup = getGroup();
 
 		context.checking(new Expectations() {{
 			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, contact);
@@ -168,18 +168,18 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testDoesNotDeleteAnythingWhenFirstUpdateIsDelivered()
 			throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final GroupId contactGroupId = new GroupId(getRandomId());
+		GroupId contactGroupId = new GroupId(getRandomId());
-		final long timestamp = 123456789;
+		long timestamp = 123456789;
-		final Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId, timestamp);
-		final Metadata meta = new Metadata();
+		Metadata meta = new Metadata();
-		final BdfDictionary metaDictionary = BdfDictionary.of(
+		BdfDictionary metaDictionary = BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 2),
 				new BdfEntry("local", false)
 		);
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// A remote update for another transport should be ignored
 		MessageId barUpdateId = new MessageId(getRandomId());
 		messageMetadata.put(barUpdateId, BdfDictionary.of(
@@ -210,32 +210,32 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testDeletesOlderUpdatesWhenUpdateIsDelivered()
 			throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final GroupId contactGroupId = new GroupId(getRandomId());
+		GroupId contactGroupId = new GroupId(getRandomId());
-		final long timestamp = 123456789;
+		long timestamp = 123456789;
-		final Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId, timestamp);
-		final Metadata meta = new Metadata();
+		Metadata meta = new Metadata();
-		final BdfDictionary metaDictionary = BdfDictionary.of(
+		BdfDictionary metaDictionary = BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 4),
 				new BdfEntry("local", false)
 		);
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// Old remote updates for the same transport should be deleted
-		final MessageId fooVersion2 = new MessageId(getRandomId());
+		MessageId fooVersion2 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion2, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 2),
 				new BdfEntry("local", false)
 		));
-		final MessageId fooVersion1 = new MessageId(getRandomId());
+		MessageId fooVersion1 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion1, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 1),
 				new BdfEntry("local", false)
 		));
-		final MessageId fooVersion3 = new MessageId(getRandomId());
+		MessageId fooVersion3 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion3, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 3),
@@ -263,33 +263,33 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testDeletesObsoleteUpdateWhenDelivered() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final GroupId contactGroupId = new GroupId(getRandomId());
+		GroupId contactGroupId = new GroupId(getRandomId());
-		final long timestamp = 123456789;
+		long timestamp = 123456789;
-		final Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId, timestamp);
-		final Metadata meta = new Metadata();
+		Metadata meta = new Metadata();
-		final BdfDictionary metaDictionary = BdfDictionary.of(
+		BdfDictionary metaDictionary = BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 3),
 				new BdfEntry("local", false)
 		);
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// Old remote updates for the same transport should be deleted
-		final MessageId fooVersion2 = new MessageId(getRandomId());
+		MessageId fooVersion2 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion2, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 2),
 				new BdfEntry("local", false)
 		));
-		final MessageId fooVersion1 = new MessageId(getRandomId());
+		MessageId fooVersion1 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion1, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 1),
 				new BdfEntry("local", false)
 		));
 		// A newer remote update for the same transport should not be deleted
-		final MessageId fooVersion4 = new MessageId(getRandomId());
+		MessageId fooVersion4 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion4, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 4),
@@ -318,11 +318,11 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testStoresRemotePropertiesWithVersion0() throws Exception {
-		final Contact contact = getContact(true);
+		Contact contact = getContact(true);
-		final Group contactGroup = getGroup();
+		Group contactGroup = getGroup();
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 		Map<TransportId, TransportProperties> properties =
-				new LinkedHashMap<TransportId, TransportProperties>();
+				new LinkedHashMap<>();
 		properties.put(new TransportId("foo"), fooProperties);
 		properties.put(new TransportId("bar"), barProperties);
 
@@ -357,9 +357,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testReturnsEmptyPropertiesIfNoLocalPropertiesAreFound()
 			throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// A local update for another transport should be ignored
 		MessageId barUpdateId = new MessageId(getRandomId());
 		messageMetadata.put(barUpdateId, BdfDictionary.of(
@@ -384,9 +384,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testReturnsLocalProperties() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// A local update for another transport should be ignored
 		MessageId barUpdateId = new MessageId(getRandomId());
 		messageMetadata.put(barUpdateId, BdfDictionary.of(
@@ -395,13 +395,13 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 				new BdfEntry("local", true)
 		));
 		// A local update for the right transport should be returned
-		final MessageId fooUpdateId = new MessageId(getRandomId());
+		MessageId fooUpdateId = new MessageId(getRandomId());
 		messageMetadata.put(fooUpdateId, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 1),
 				new BdfEntry("local", true)
 		));
-		final BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
+		BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -423,16 +423,16 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testReturnsRemotePropertiesOrEmptyProperties()
 			throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 		Contact contact1 = getContact(false);
-		final Contact contact2 = getContact(true);
+		Contact contact2 = getContact(true);
-		final Contact contact3 = getContact(true);
+		Contact contact3 = getContact(true);
-		final List<Contact> contacts =
+		List<Contact> contacts =
 				Arrays.asList(contact1, contact2, contact3);
-		final Group contactGroup2 = getGroup();
+		Group contactGroup2 = getGroup();
-		final Group contactGroup3 = getGroup();
+		Group contactGroup3 = getGroup();
-		final Map<MessageId, BdfDictionary> messageMetadata3 =
+		Map<MessageId, BdfDictionary> messageMetadata3 =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// A remote update for another transport should be ignored
 		MessageId barUpdateId = new MessageId(getRandomId());
 		messageMetadata3.put(barUpdateId, BdfDictionary.of(
@@ -448,13 +448,13 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 				new BdfEntry("local", true)
 		));
 		// A remote update for the right transport should be returned
-		final MessageId fooUpdateId = new MessageId(getRandomId());
+		MessageId fooUpdateId = new MessageId(getRandomId());
 		messageMetadata3.put(fooUpdateId, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 1),
 				new BdfEntry("local", false)
 		));
-		final BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
+		BdfList fooUpdate = BdfList.of("foo", 1, fooPropertiesDict);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -492,15 +492,15 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMergingUnchangedPropertiesDoesNotCreateUpdate()
 			throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final MessageId updateId = new MessageId(getRandomId());
+		MessageId updateId = new MessageId(getRandomId());
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
 				Collections.singletonMap(updateId, BdfDictionary.of(
 						new BdfEntry("transportId", "foo"),
 						new BdfEntry("version", 1),
 						new BdfEntry("local", true)
 				));
-		final BdfList update = BdfList.of("foo", 1, fooPropertiesDict);
+		BdfList update = BdfList.of("foo", 1, fooPropertiesDict);
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -522,9 +522,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMergingNewPropertiesCreatesUpdate() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Contact contact = getContact(true);
+		Contact contact = getContact(true);
-		final Group contactGroup = getGroup();
+		Group contactGroup = getGroup();
 
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(false);
@@ -556,21 +556,21 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMergingUpdatedPropertiesCreatesUpdate() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Contact contact = getContact(true);
+		Contact contact = getContact(true);
-		final Group contactGroup = getGroup();
+		Group contactGroup = getGroup();
 		BdfDictionary oldMetadata = BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 1),
 				new BdfEntry("local", true)
 		);
-		final MessageId localGroupUpdateId = new MessageId(getRandomId());
+		MessageId localGroupUpdateId = new MessageId(getRandomId());
-		final Map<MessageId, BdfDictionary> localGroupMessageMetadata =
+		Map<MessageId, BdfDictionary> localGroupMessageMetadata =
 				Collections.singletonMap(localGroupUpdateId, oldMetadata);
-		final MessageId contactGroupUpdateId = new MessageId(getRandomId());
+		MessageId contactGroupUpdateId = new MessageId(getRandomId());
-		final Map<MessageId, BdfDictionary> contactGroupMessageMetadata =
+		Map<MessageId, BdfDictionary> contactGroupMessageMetadata =
 				Collections.singletonMap(contactGroupUpdateId, oldMetadata);
-		final BdfList oldUpdate = BdfList.of("foo", 1, BdfDictionary.of(
+		BdfList oldUpdate = BdfList.of("foo", 1, BdfDictionary.of(
 				new BdfEntry("fooKey1", "oldFooValue1")
 		));
 
@@ -638,36 +638,36 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 		return new Message(messageId, g, timestamp, raw);
 	}
 
-	private void expectGetLocalProperties(final Transaction txn)
+	private void expectGetLocalProperties(Transaction txn)
 			throws Exception {
-		final Map<MessageId, BdfDictionary> messageMetadata =
+		Map<MessageId, BdfDictionary> messageMetadata =
-				new LinkedHashMap<MessageId, BdfDictionary>();
+				new LinkedHashMap<>();
 		// The only update for transport "foo" should be returned
-		final MessageId fooVersion999 = new MessageId(getRandomId());
+		MessageId fooVersion999 = new MessageId(getRandomId());
 		messageMetadata.put(fooVersion999, BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
 				new BdfEntry("version", 999)
 		));
 		// An old update for transport "bar" should be deleted
-		final MessageId barVersion2 = new MessageId(getRandomId());
+		MessageId barVersion2 = new MessageId(getRandomId());
 		messageMetadata.put(barVersion2, BdfDictionary.of(
 				new BdfEntry("transportId", "bar"),
 				new BdfEntry("version", 2)
 		));
 		// An even older update for transport "bar" should be deleted
-		final MessageId barVersion1 = new MessageId(getRandomId());
+		MessageId barVersion1 = new MessageId(getRandomId());
 		messageMetadata.put(barVersion1, BdfDictionary.of(
 				new BdfEntry("transportId", "bar"),
 				new BdfEntry("version", 1)
 		));
 		// The latest update for transport "bar" should be returned
-		final MessageId barVersion3 = new MessageId(getRandomId());
+		MessageId barVersion3 = new MessageId(getRandomId());
 		messageMetadata.put(barVersion3, BdfDictionary.of(
 				new BdfEntry("transportId", "bar"),
 				new BdfEntry("version", 3)
 		));
-		final BdfList fooUpdate = BdfList.of("foo", 999, fooPropertiesDict);
+		BdfList fooUpdate = BdfList.of("foo", 999, fooPropertiesDict);
-		final BdfList barUpdate = BdfList.of("bar", 3, barPropertiesDict);
+		BdfList barUpdate = BdfList.of("bar", 3, barPropertiesDict);
 
 		context.checking(new Expectations() {{
 			// Find the latest local update for each transport
@@ -684,13 +684,13 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 		}});
 	}
 
-	private void expectStoreMessage(final Transaction txn, final GroupId g,
+	private void expectStoreMessage(Transaction txn, GroupId g,
-			String transportId, final BdfDictionary properties, long version,
+			String transportId, BdfDictionary properties, long version,
-			boolean local, final boolean shared) throws Exception {
+			boolean local, boolean shared) throws Exception {
-		final long timestamp = 123456789;
+		long timestamp = 123456789;
-		final BdfList body = BdfList.of(transportId, version, properties);
+		BdfList body = BdfList.of(transportId, version, properties);
-		final Message message = getMessage(g, timestamp);
+		Message message = getMessage(g, timestamp);
-		final BdfDictionary meta = BdfDictionary.of(
+		BdfDictionary meta = BdfDictionary.of(
 				new BdfEntry("transportId", transportId),
 				new BdfEntry("version", version),
 				new BdfEntry("local", local)

bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java

@@ -6,10 +6,10 @@ import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.sync.Ack;
 import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.sync.RecordWriter;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
 import org.briarproject.bramble.test.TestUtils;
-import org.briarproject.bramble.api.sync.RecordWriter;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
@@ -44,10 +44,10 @@ public class SimplexOutgoingSessionTest extends BrambleTestCase {
 
 	@Test
 	public void testNothingToSend() throws Exception {
-		final SimplexOutgoingSession session = new SimplexOutgoingSession(db,
+		SimplexOutgoingSession session = new SimplexOutgoingSession(db,
 				dbExecutor, eventBus, contactId, maxLatency, recordWriter);
-		final Transaction noAckTxn = new Transaction(null, false);
+		Transaction noAckTxn = new Transaction(null, false);
-		final Transaction noMsgTxn = new Transaction(null, false);
+		Transaction noMsgTxn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Add listener
@@ -80,14 +80,14 @@ public class SimplexOutgoingSessionTest extends BrambleTestCase {
 
 	@Test
 	public void testSomethingToSend() throws Exception {
-		final Ack ack = new Ack(Collections.singletonList(messageId));
+		Ack ack = new Ack(Collections.singletonList(messageId));
-		final byte[] raw = new byte[1234];
+		byte[] raw = new byte[1234];
-		final SimplexOutgoingSession session = new SimplexOutgoingSession(db,
+		SimplexOutgoingSession session = new SimplexOutgoingSession(db,
 				dbExecutor, eventBus, contactId, maxLatency, recordWriter);
-		final Transaction ackTxn = new Transaction(null, false);
+		Transaction ackTxn = new Transaction(null, false);
-		final Transaction noAckTxn = new Transaction(null, false);
+		Transaction noAckTxn = new Transaction(null, false);
-		final Transaction msgTxn = new Transaction(null, false);
+		Transaction msgTxn = new Transaction(null, false);
-		final Transaction noMsgTxn = new Transaction(null, false);
+		Transaction noMsgTxn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Add listener

bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java

@@ -92,9 +92,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testStartAndStop() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, true);
+		Transaction txn2 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// validateOutstandingMessages()
@@ -126,13 +126,13 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMessagesAreValidatedAtStartup() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
-		final Transaction txn3 = new Transaction(null, true);
+		Transaction txn3 = new Transaction(null, true);
-		final Transaction txn4 = new Transaction(null, false);
+		Transaction txn4 = new Transaction(null, false);
-		final Transaction txn5 = new Transaction(null, true);
+		Transaction txn5 = new Transaction(null, true);
-		final Transaction txn6 = new Transaction(null, true);
+		Transaction txn6 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -217,11 +217,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testPendingMessagesAreDeliveredAtStartup() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, true);
+		Transaction txn4 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -303,11 +303,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testMessagesAreSharedAtStartup() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, true);
+		Transaction txn2 = new Transaction(null, true);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, false);
+		Transaction txn4 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// No messages to validate
@@ -355,9 +355,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testIncomingMessagesAreShared() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -405,12 +405,12 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testValidationContinuesAfterNoSuchMessageException()
 			throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, true);
+		Transaction txn2 = new Transaction(null, true);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, true);
+		Transaction txn4 = new Transaction(null, true);
-		final Transaction txn5 = new Transaction(null, true);
+		Transaction txn5 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -476,12 +476,12 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testValidationContinuesAfterNoSuchGroupException()
 			throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, true);
+		Transaction txn1 = new Transaction(null, true);
-		final Transaction txn2 = new Transaction(null, true);
+		Transaction txn2 = new Transaction(null, true);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, true);
+		Transaction txn4 = new Transaction(null, true);
-		final Transaction txn5 = new Transaction(null, true);
+		Transaction txn5 = new Transaction(null, true);
 
 		context.checking(new Expectations() {{
 			// Get messages to validate
@@ -551,8 +551,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testNonLocalMessagesAreValidatedWhenAdded() throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -591,8 +591,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithUndeliveredDependenciesArePending()
 			throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -624,8 +624,8 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithDeliveredDependenciesGetDelivered()
 			throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -663,9 +663,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	@Test
 	public void testMessagesWithInvalidDependenciesAreInvalid()
 			throws Exception {
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -716,19 +716,18 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testRecursiveInvalidation() throws Exception {
-		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
-		final MessageId messageId4 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId4 = new MessageId(TestUtils.getRandomId());
-		final Map<MessageId, State> twoDependents =
+		Map<MessageId, State> twoDependents = new LinkedHashMap<>();
-				new LinkedHashMap<MessageId, State>();
 		twoDependents.put(messageId1, PENDING);
 		twoDependents.put(messageId2, PENDING);
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, false);
+		Transaction txn4 = new Transaction(null, false);
-		final Transaction txn5 = new Transaction(null, false);
+		Transaction txn5 = new Transaction(null, false);
-		final Transaction txn6 = new Transaction(null, false);
+		Transaction txn6 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -820,27 +819,25 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testPendingDependentsGetDelivered() throws Exception {
-		final MessageId messageId3 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId3 = new MessageId(TestUtils.getRandomId());
-		final MessageId messageId4 = new MessageId(TestUtils.getRandomId());
+		MessageId messageId4 = new MessageId(TestUtils.getRandomId());
-		final Message message3 = new Message(messageId3, groupId, timestamp,
+		Message message3 = new Message(messageId3, groupId, timestamp,
 				raw);
-		final Message message4 = new Message(messageId4, groupId, timestamp,
+		Message message4 = new Message(messageId4, groupId, timestamp,
 				raw);
-		final Map<MessageId, State> twoDependents =
+		Map<MessageId, State> twoDependents = new LinkedHashMap<>();
-				new LinkedHashMap<MessageId, State>();
 		twoDependents.put(messageId1, PENDING);
 		twoDependents.put(messageId2, PENDING);
-		final Map<MessageId, State> twoDependencies =
+		Map<MessageId, State> twoDependencies = new LinkedHashMap<>();
-				new LinkedHashMap<MessageId, State>();
 		twoDependencies.put(messageId1, DELIVERED);
 		twoDependencies.put(messageId2, DELIVERED);
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
-		final Transaction txn3 = new Transaction(null, false);
+		Transaction txn3 = new Transaction(null, false);
-		final Transaction txn4 = new Transaction(null, false);
+		Transaction txn4 = new Transaction(null, false);
-		final Transaction txn5 = new Transaction(null, false);
+		Transaction txn5 = new Transaction(null, false);
-		final Transaction txn6 = new Transaction(null, false);
+		Transaction txn6 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group
@@ -979,13 +976,12 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testOnlyReadyPendingDependentsGetDelivered() throws Exception {
-		final Map<MessageId, State> twoDependencies =
+		Map<MessageId, State> twoDependencies = new LinkedHashMap<>();
-				new LinkedHashMap<MessageId, State>();
 		twoDependencies.put(messageId, DELIVERED);
 		twoDependencies.put(messageId2, UNKNOWN);
-		final Transaction txn = new Transaction(null, true);
+		Transaction txn = new Transaction(null, true);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
-		final Transaction txn2 = new Transaction(null, false);
+		Transaction txn2 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Load the group

bramble-core/src/test/java/org/briarproject/bramble/system/LinuxSecureRandomSpiTest.java

@@ -38,7 +38,7 @@ public class LinuxSecureRandomSpiTest extends BrambleTestCase {
 			System.err.println("WARNING: Skipping test, can't run on this OS");
 			return;
 		}
-		Set<Bytes> seeds = new HashSet<Bytes>();
+		Set<Bytes> seeds = new HashSet<>();
 		LinuxSecureRandomSpi engine = new LinuxSecureRandomSpi();
 		for (int i = 0; i < 1000; i++) {
 			byte[] seed = engine.engineGenerateSeed(SEED_BYTES);

bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java

@@ -58,21 +58,21 @@ public class KeyManagerImplTest extends BrambleTestCase {
 
 	@Before
 	public void testStartService() throws Exception {
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 		AuthorId remoteAuthorId = new AuthorId(getRandomId());
 		Author remoteAuthor = new Author(remoteAuthorId, "author",
 				getRandomBytes(42));
 		AuthorId localAuthorId = new AuthorId(getRandomId());
-		final Collection<Contact> contacts = new ArrayList<Contact>();
+		Collection<Contact> contacts = new ArrayList<>();
 		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId, true,
 				true));
 		contacts.add(new Contact(inactiveContactId, remoteAuthor, localAuthorId,
 				true, false));
-		final SimplexPluginFactory pluginFactory =
+		SimplexPluginFactory pluginFactory =
 				context.mock(SimplexPluginFactory.class);
-		final Collection<SimplexPluginFactory> factories = Collections
+		Collection<SimplexPluginFactory> factories = Collections
 				.singletonList(pluginFactory);
-		final int maxLatency = 1337;
+		int maxLatency = 1337;
 
 		context.checking(new Expectations() {{
 			oneOf(pluginConfig).getSimplexFactories();
@@ -100,9 +100,9 @@ public class KeyManagerImplTest extends BrambleTestCase {
 
 	@Test
 	public void testAddContact() throws Exception {
-		final SecretKey secretKey = getSecretKey();
+		SecretKey secretKey = getSecretKey();
-		final long timestamp = 42L;
+		long timestamp = 42L;
-		final boolean alice =  true;
+		boolean alice =  true;
 
 		context.checking(new Expectations() {{
 			oneOf(transportKeyManager)

bramble-core/src/test/java/org/briarproject/bramble/transport/StreamReaderImplTest.java

@@ -14,7 +14,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testEmptyFramesAreSkipped() throws Exception {
 		Mockery context = new Mockery();
-		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(0)); // Empty frame
@@ -37,7 +37,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testEmptyFramesAreSkippedWithBuffer() throws Exception {
 		Mockery context = new Mockery();
-		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(0)); // Empty frame
@@ -63,7 +63,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testMultipleReadsPerFrame() throws Exception {
 		Mockery context = new Mockery();
-		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(MAX_PAYLOAD_LENGTH)); // Nice long frame
@@ -85,7 +85,7 @@ public class StreamReaderImplTest extends BrambleTestCase {
 	@Test
 	public void testMultipleReadsPerFrameWithOffsets() throws Exception {
 		Mockery context = new Mockery();
-		final StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
+		StreamDecrypter decrypter = context.mock(StreamDecrypter.class);
 		context.checking(new Expectations() {{
 			oneOf(decrypter).readFrame(with(any(byte[].class)));
 			will(returnValue(MAX_PAYLOAD_LENGTH)); // Nice long frame

bramble-core/src/test/java/org/briarproject/bramble/transport/StreamWriterImplTest.java

@@ -14,7 +14,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testCloseWithoutWritingWritesFinalFrame() throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		context.checking(new Expectations() {{
 			// Write an empty final frame
 			oneOf(encrypter).writeFrame(with(any(byte[].class)), with(0),
@@ -31,7 +31,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	public void testFlushWithoutBufferedDataWritesFrameAndFlushes()
 			throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a non-final frame with an empty payload
@@ -58,7 +58,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	public void testFlushWithBufferedDataWritesFrameAndFlushes()
 			throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a non-final frame with one payload byte
@@ -85,7 +85,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testSingleByteWritesWriteFullFrame() throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write a full non-final frame
@@ -109,7 +109,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testMultiByteWritesWriteFullFrames() throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write two full non-final frames
@@ -140,7 +140,7 @@ public class StreamWriterImplTest extends BrambleTestCase {
 	@Test
 	public void testLargeMultiByteWriteWritesFullFrames() throws Exception {
 		Mockery context = new Mockery();
-		final StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
+		StreamEncrypter encrypter = context.mock(StreamEncrypter.class);
 		StreamWriterImpl w = new StreamWriterImpl(encrypter);
 		context.checking(new Expectations() {{
 			// Write two full non-final frames

bramble-core/src/test/java/org/briarproject/bramble/transport/TransportKeyManagerImplTest.java

@@ -56,21 +56,20 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedAtStartup() throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final Map<ContactId, TransportKeys> loaded =
+		Map<ContactId, TransportKeys> loaded = new LinkedHashMap<>();
-				new LinkedHashMap<ContactId, TransportKeys>();
+		TransportKeys shouldRotate = createTransportKeys(900, 0);
-		final TransportKeys shouldRotate = createTransportKeys(900, 0);
+		TransportKeys shouldNotRotate = createTransportKeys(1000, 0);
-		final TransportKeys shouldNotRotate = createTransportKeys(1000, 0);
 		loaded.put(contactId, shouldRotate);
 		loaded.put(contactId1, shouldNotRotate);
-		final TransportKeys rotated = createTransportKeys(1000, 0);
+		TransportKeys rotated = createTransportKeys(1000, 0);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Get the current time (1 ms after start of rotation period 1000)
@@ -109,17 +108,17 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedWhenAddingContact() throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final boolean alice = true;
+		boolean alice = true;
-		final TransportKeys transportKeys = createTransportKeys(999, 0);
+		TransportKeys transportKeys = createTransportKeys(999, 0);
-		final TransportKeys rotated = createTransportKeys(1000, 0);
+		TransportKeys rotated = createTransportKeys(1000, 0);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 999,
@@ -156,14 +155,14 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testOutgoingStreamContextIsNullIfContactIsNotFound()
 			throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		TransportKeyManager
 				transportKeyManager = new TransportKeyManagerImpl(db,
@@ -177,18 +176,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testOutgoingStreamContextIsNullIfStreamCounterIsExhausted()
 			throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final boolean alice = true;
+		boolean alice = true;
 		// The stream counter has been exhausted
-		final TransportKeys transportKeys = createTransportKeys(1000,
+		TransportKeys transportKeys = createTransportKeys(1000,
 				MAX_32_BIT_UNSIGNED + 1);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -225,18 +224,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testOutgoingStreamCounterIsIncremented() throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final boolean alice = true;
+		boolean alice = true;
 		// The stream counter can be used one more time before being exhausted
-		final TransportKeys transportKeys = createTransportKeys(1000,
+		TransportKeys transportKeys = createTransportKeys(1000,
 				MAX_32_BIT_UNSIGNED);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -286,16 +285,16 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	public void testIncomingStreamContextIsNullIfTagIsNotFound()
 			throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final boolean alice = true;
+		boolean alice = true;
-		final TransportKeys transportKeys = createTransportKeys(1000, 0);
+		TransportKeys transportKeys = createTransportKeys(1000, 0);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -333,18 +332,18 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testTagIsNotRecognisedTwice() throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final boolean alice = true;
+		boolean alice = true;
-		final TransportKeys transportKeys = createTransportKeys(1000, 0);
+		TransportKeys transportKeys = createTransportKeys(1000, 0);
 		// Keep a copy of the tags
-		final List<byte[]> tags = new ArrayList<byte[]>();
+		List<byte[]> tags = new ArrayList<>();
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			oneOf(crypto).deriveTransportKeys(transportId, masterKey, 1000,
@@ -403,19 +402,19 @@ public class TransportKeyManagerImplTest extends BrambleTestCase {
 	@Test
 	public void testKeysAreRotatedToCurrentPeriod() throws Exception {
 		Mockery context = new Mockery();
-		final DatabaseComponent db = context.mock(DatabaseComponent.class);
+		DatabaseComponent db = context.mock(DatabaseComponent.class);
-		final CryptoComponent crypto = context.mock(CryptoComponent.class);
+		CryptoComponent crypto = context.mock(CryptoComponent.class);
-		final Executor dbExecutor = context.mock(Executor.class);
+		Executor dbExecutor = context.mock(Executor.class);
-		final ScheduledExecutorService scheduler =
+		ScheduledExecutorService scheduler =
 				context.mock(ScheduledExecutorService.class);
-		final Clock clock = context.mock(Clock.class);
+		Clock clock = context.mock(Clock.class);
 
-		final TransportKeys transportKeys = createTransportKeys(1000, 0);
+		TransportKeys transportKeys = createTransportKeys(1000, 0);
-		final Map<ContactId, TransportKeys> loaded =
+		Map<ContactId, TransportKeys> loaded =
 				Collections.singletonMap(contactId, transportKeys);
-		final TransportKeys rotated = createTransportKeys(1001, 0);
+		TransportKeys rotated = createTransportKeys(1001, 0);
-		final Transaction txn = new Transaction(null, false);
+		Transaction txn = new Transaction(null, false);
-		final Transaction txn1 = new Transaction(null, false);
+		Transaction txn1 = new Transaction(null, false);
 
 		context.checking(new Expectations() {{
 			// Get the current time (the start of rotation period 1000)

bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java

@@ -110,20 +110,16 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
 		public void run() {
 			try {
 				// Load user32.dll
-				final User32 user32 = (User32) Native.loadLibrary("user32",
+				User32 user32 = (User32) Native.loadLibrary("user32",
 						User32.class, options);
 				// Create a callback to handle the WM_QUERYENDSESSION message
-				WindowProc proc = new WindowProc() {
+				WindowProc proc = (hwnd, msg, wp, lp) -> {
-					@Override
+					if (msg == WM_QUERYENDSESSION) {
-					public LRESULT callback(HWND hwnd, int msg, WPARAM wp,
+						// It's safe to delay returning from this message
-							LPARAM lp) {
+						runShutdownHooks();
-						if (msg == WM_QUERYENDSESSION) {
-							// It's safe to delay returning from this message
-							runShutdownHooks();
-						}
-						// Pass the message to the default window procedure
-						return user32.DefWindowProc(hwnd, msg, wp, lp);
 					}
+					// Pass the message to the default window procedure
+					return user32.DefWindowProc(hwnd, msg, wp, lp);
 				};
 				// Create a native window
 				HWND hwnd = user32.CreateWindowEx(0, "STATIC", "", WS_MINIMIZE,

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java

@@ -41,9 +41,9 @@ public class DesktopPluginModule extends PluginModule {
 				backoffFactory, shutdownManager);
 		SimplexPluginFactory removable =
 				new RemovableDrivePluginFactory(ioExecutor);
-		final Collection<SimplexPluginFactory> simplex =
+		Collection<SimplexPluginFactory> simplex =
 				Collections.singletonList(removable);
-		final Collection<DuplexPluginFactory> duplex =
+		Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, modem, lan, wan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -108,33 +108,30 @@ class BluetoothPlugin implements DuplexPlugin {
 	}
 
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			if (!running) return;
-			public void run() {
+			// Advertise the Bluetooth address to contacts
-				if (!running) return;
+			TransportProperties p = new TransportProperties();
-				// Advertise the Bluetooth address to contacts
+			p.put(PROP_ADDRESS, localDevice.getBluetoothAddress());
-				TransportProperties p = new TransportProperties();
+			callback.mergeLocalProperties(p);
-				p.put(PROP_ADDRESS, localDevice.getBluetoothAddress());
+			// Bind a server socket to accept connections from contacts
-				callback.mergeLocalProperties(p);
+			String url = makeUrl("localhost", getUuid());
-				// Bind a server socket to accept connections from contacts
+			StreamConnectionNotifier ss;
-				String url = makeUrl("localhost", getUuid());
+			try {
-				StreamConnectionNotifier ss;
+				ss = (StreamConnectionNotifier) Connector.open(url);
-				try {
+			} catch (IOException e) {
-					ss = (StreamConnectionNotifier) Connector.open(url);
+				if (LOG.isLoggable(WARNING))
-				} catch (IOException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				return;
-						LOG.log(WARNING, e.toString(), e);
-					return;
-				}
-				if (!running) {
-					tryToClose(ss);
-					return;
-				}
-				socket = ss;
-				backoff.reset();
-				callback.transportEnabled();
-				acceptContactConnections(ss);
 			}
+			if (!running) {
+				tryToClose(ss);
+				return;
+			}
+			socket = ss;
+			backoff.reset();
+			callback.transportEnabled();
+			acceptContactConnections(ss);
 		});
 	}
 
@@ -207,33 +204,31 @@ class BluetoothPlugin implements DuplexPlugin {
 	}
 
 	@Override
-	public void poll(final Collection<ContactId> connected) {
+	public void poll(Collection<ContactId> connected) {
 		if (!running) return;
 		backoff.increment();
 		// Try to connect to known devices in parallel
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
-			final ContactId c = e.getKey();
+			ContactId c = e.getKey();
 			if (connected.contains(c)) continue;
-			final String address = e.getValue().get(PROP_ADDRESS);
+			String address = e.getValue().get(PROP_ADDRESS);
 			if (StringUtils.isNullOrEmpty(address)) continue;
-			final String uuid = e.getValue().get(PROP_UUID);
+			String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(new Runnable() {
+			ioExecutor.execute(() -> {
-				@Override
+				if (!running) return;
-				public void run() {
+				StreamConnection s = connect(makeUrl(address, uuid));
-					if (!running) return;
+				if (s != null) {
-					StreamConnection s = connect(makeUrl(address, uuid));
+					backoff.reset();
-					if (s != null) {
+					callback.outgoingConnectionCreated(c, wrapSocket(s));
-						backoff.reset();
-						callback.outgoingConnectionCreated(c, wrapSocket(s));
-					}
 				}
 			});
 		}
 	}
 
+	@Nullable
 	private StreamConnection connect(String url) {
 		if (LOG.isLoggable(INFO)) LOG.info("Connecting to " + url);
 		try {
@@ -275,7 +270,7 @@ class BluetoothPlugin implements DuplexPlugin {
 		// Make the device discoverable if possible
 		makeDeviceDiscoverable();
 		// Bind a server socket for receiving key agreementconnections
-		final StreamConnectionNotifier ss;
+		StreamConnectionNotifier ss;
 		try {
 			ss = (StreamConnectionNotifier) Connector.open(url);
 		} catch (IOException e) {
@@ -341,16 +336,13 @@ class BluetoothPlugin implements DuplexPlugin {
 
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
+			return () -> {
-				@Override
+				StreamConnection s = ss.acceptAndOpen();
-				public KeyAgreementConnection call() throws Exception {
+				if (LOG.isLoggable(INFO))
-					StreamConnection s = ss.acceptAndOpen();
+					LOG.info(ID.getString() + ": Incoming connection");
-					if (LOG.isLoggable(INFO))
+				return new KeyAgreementConnection(
-						LOG.info(ID.getString() + ": Incoming connection");
+						new BluetoothTransportConnection(
-					return new KeyAgreementConnection(
+								BluetoothPlugin.this, s), ID);
-							new BluetoothTransportConnection(
-									BluetoothPlugin.this, s), ID);
-				}
 			};
 		}
 

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitor.java

@@ -13,6 +13,8 @@ import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import javax.annotation.Nullable;
+
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 abstract class UnixRemovableDriveMonitor implements RemovableDriveMonitor,
@@ -34,13 +36,12 @@ JNotifyListener {
 
 	protected abstract String[] getPathsToWatch();
 
+	@Nullable
 	private static Throwable tryLoad() {
 		try {
 			Class.forName("net.contentobjects.jnotify.JNotify");
 			return null;
-		} catch (UnsatisfiedLinkError e) {
+		} catch (UnsatisfiedLinkError | ClassNotFoundException e) {
-			return e;
-		} catch (ClassNotFoundException e) {
 			return e;
 		}
 	}

bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java

@@ -390,15 +390,12 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
 						lock.unlock();
 					}
 				} else if (s.equals("RING")) {
-					ioExecutor.execute(new Runnable() {
+					ioExecutor.execute(() -> {
-						@Override
+						try {
-						public void run() {
+							answer();
-							try {
+						} catch (IOException e) {
-								answer();
+							if (LOG.isLoggable(WARNING))
-							} catch (IOException e) {
+								LOG.log(WARNING, e.toString(), e);
-								if (LOG.isLoggable(WARNING))
-									LOG.log(WARNING, e.toString(), e);
-							}
 						}
 					});
 				}

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/PollingRemovableDriveMonitorTest.java

@@ -26,10 +26,10 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 	@Test
 	public void testOneCallbackPerFile() throws Exception {
 		// Create a finder that returns no files the first time, then two files
-		final File file1 = new File("foo");
+		File file1 = new File("foo");
-		final File file2 = new File("bar");
+		File file2 = new File("bar");
 		@NotNullByDefault
-		final RemovableDriveFinder finder = new RemovableDriveFinder() {
+		RemovableDriveFinder finder = new RemovableDriveFinder() {
 
 			private AtomicBoolean firstCall = new AtomicBoolean(true);
 
@@ -40,8 +40,8 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create a callback that waits for two files
-		final CountDownLatch latch = new CountDownLatch(2);
+		CountDownLatch latch = new CountDownLatch(2);
-		final List<File> detected = new ArrayList<>();
+		List<File> detected = new ArrayList<>();
 		@NotNullByDefault
 		Callback callback = new Callback() {
 
@@ -57,7 +57,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create the monitor and start it
-		final RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
+		RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
 				Executors.newCachedThreadPool(), finder, 1);
 		monitor.start(callback);
 		// Wait for the monitor to detect the files
@@ -72,7 +72,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 	@Test
 	public void testExceptionCallback() throws Exception {
 		// Create a finder that throws an exception the second time it's polled
-		final RemovableDriveFinder finder = new RemovableDriveFinder() {
+		RemovableDriveFinder finder = new RemovableDriveFinder() {
 
 			private AtomicBoolean firstCall = new AtomicBoolean(true);
 
@@ -83,7 +83,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create a callback that waits for an exception
-		final CountDownLatch latch = new CountDownLatch(1);
+		CountDownLatch latch = new CountDownLatch(1);
 		@NotNullByDefault
 		Callback callback = new Callback() {
 
@@ -98,7 +98,7 @@ public class PollingRemovableDriveMonitorTest extends BrambleTestCase {
 			}
 		};
 		// Create the monitor and start it
-		final RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
+		RemovableDriveMonitor monitor = new PollingRemovableDriveMonitor(
 				Executors.newCachedThreadPool(), finder, 1);
 		monitor.start(callback);
 		assertTrue(latch.await(10, SECONDS));

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/RemovableDrivePluginTest.java

@@ -41,17 +41,17 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfNoDrivesAreFound() throws Exception {
-		final List<File> drives = Collections.emptyList();
+		List<File> drives = Collections.emptyList();
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -71,21 +71,21 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfNoDriveIsChosen() throws Exception {
-		final File drive1 = new File(testDir, "1");
+		File drive1 = new File(testDir, "1");
-		final File drive2 = new File(testDir, "2");
+		File drive2 = new File(testDir, "2");
-		final List<File> drives = new ArrayList<>();
+		List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -110,21 +110,21 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfOutputDirDoesNotExist() throws Exception {
-		final File drive1 = new File(testDir, "1");
+		File drive1 = new File(testDir, "1");
-		final File drive2 = new File(testDir, "2");
+		File drive2 = new File(testDir, "2");
-		final List<File> drives = new ArrayList<>();
+		List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -149,9 +149,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNullIfOutputDirIsAFile() throws Exception {
-		final File drive1 = new File(testDir, "1");
+		File drive1 = new File(testDir, "1");
-		final File drive2 = new File(testDir, "2");
+		File drive2 = new File(testDir, "2");
-		final List<File> drives = new ArrayList<>();
+		List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a file rather than a directory
@@ -160,12 +160,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -190,9 +190,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWriterIsNotNullIfOutputDirIsADir() throws Exception {
-		final File drive1 = new File(testDir, "1");
+		File drive1 = new File(testDir, "1");
-		final File drive2 = new File(testDir, "2");
+		File drive2 = new File(testDir, "2");
-		final List<File> drives = new ArrayList<>();
+		List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a directory
@@ -201,12 +201,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -234,9 +234,9 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 
 	@Test
 	public void testWritingToWriter() throws Exception {
-		final File drive1 = new File(testDir, "1");
+		File drive1 = new File(testDir, "1");
-		final File drive2 = new File(testDir, "2");
+		File drive2 = new File(testDir, "2");
-		final List<File> drives = new ArrayList<>();
+		List<File> drives = new ArrayList<>();
 		drives.add(drive1);
 		drives.add(drive2);
 		// Create drive1 as a directory
@@ -245,12 +245,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -292,12 +292,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{
@@ -318,12 +318,12 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final Executor executor = context.mock(Executor.class);
+		Executor executor = context.mock(Executor.class);
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		RemovableDrivePlugin plugin = new RemovableDrivePlugin(executor,
@@ -344,11 +344,11 @@ public class RemovableDrivePluginTest extends BrambleTestCase {
 		Mockery context = new Mockery() {{
 			setThreadingPolicy(new Synchroniser());
 		}};
-		final SimplexPluginCallback callback =
+		SimplexPluginCallback callback =
 				context.mock(SimplexPluginCallback.class);
-		final RemovableDriveFinder finder =
+		RemovableDriveFinder finder =
 				context.mock(RemovableDriveFinder.class);
-		final RemovableDriveMonitor monitor =
+		RemovableDriveMonitor monitor =
 				context.mock(RemovableDriveMonitor.class);
 
 		context.checking(new Expectations() {{

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/file/UnixRemovableDriveMonitorTest.java

@@ -61,10 +61,10 @@ public class UnixRemovableDriveMonitorTest extends BrambleTestCase {
 			return;
 		}
 		// Create a callback that will wait for two files before stopping
-		final List<File> detected = new ArrayList<>();
+		List<File> detected = new ArrayList<>();
-		final CountDownLatch latch = new CountDownLatch(2);
+		CountDownLatch latch = new CountDownLatch(2);
 		@NotNullByDefault
-		final Callback callback = new Callback() {
+		Callback callback = new Callback() {
 
 			@Override
 			public void driveInserted(File f) {
@@ -99,7 +99,7 @@ public class UnixRemovableDriveMonitorTest extends BrambleTestCase {
 		TestUtils.deleteTestDirectory(testDir);
 	}
 
-	private RemovableDriveMonitor createMonitor(final File dir) {
+	private RemovableDriveMonitor createMonitor(File dir) {
 		@NotNullByDefault
 		RemovableDriveMonitor monitor = new UnixRemovableDriveMonitor() {
 			@Override

bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java

@@ -21,12 +21,12 @@ public class ModemPluginTest extends BrambleTestCase {
 	@Test
 	public void testModemCreation() throws Exception {
 		Mockery context = new Mockery();
-		final ModemFactory modemFactory = context.mock(ModemFactory.class);
+		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		final SerialPortList serialPortList =
+		SerialPortList serialPortList =
 				context.mock(SerialPortList.class);
-		final ModemPlugin plugin = new ModemPlugin(modemFactory,
+		ModemPlugin plugin = new ModemPlugin(modemFactory,
 				serialPortList, null, 0);
-		final Modem modem = context.mock(Modem.class);
+		Modem modem = context.mock(Modem.class);
 		context.checking(new Expectations() {{
 			oneOf(serialPortList).getPortNames();
 			will(returnValue(new String[] { "foo", "bar", "baz" }));
@@ -53,20 +53,20 @@ public class ModemPluginTest extends BrambleTestCase {
 	@Test
 	public void testCreateConnection() throws Exception {
 		Mockery context = new Mockery();
-		final ModemFactory modemFactory = context.mock(ModemFactory.class);
+		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		final SerialPortList serialPortList =
+		SerialPortList serialPortList =
 				context.mock(SerialPortList.class);
-		final DuplexPluginCallback callback =
+		DuplexPluginCallback callback =
 				context.mock(DuplexPluginCallback.class);
-		final ModemPlugin plugin = new ModemPlugin(modemFactory,
+		ModemPlugin plugin = new ModemPlugin(modemFactory,
 				serialPortList, callback, 0);
-		final Modem modem = context.mock(Modem.class);
+		Modem modem = context.mock(Modem.class);
-		final TransportProperties local = new TransportProperties();
+		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
-		final TransportProperties remote = new TransportProperties();
+		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
-		final ContactId contactId = new ContactId(234);
+		ContactId contactId = new ContactId(234);
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();
@@ -92,20 +92,20 @@ public class ModemPluginTest extends BrambleTestCase {
 	@Test
 	public void testCreateConnectionWhenDialReturnsFalse() throws Exception {
 		Mockery context = new Mockery();
-		final ModemFactory modemFactory = context.mock(ModemFactory.class);
+		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		final SerialPortList serialPortList =
+		SerialPortList serialPortList =
 				context.mock(SerialPortList.class);
-		final DuplexPluginCallback callback =
+		DuplexPluginCallback callback =
 				context.mock(DuplexPluginCallback.class);
-		final ModemPlugin plugin = new ModemPlugin(modemFactory,
+		ModemPlugin plugin = new ModemPlugin(modemFactory,
 				serialPortList, callback, 0);
-		final Modem modem = context.mock(Modem.class);
+		Modem modem = context.mock(Modem.class);
-		final TransportProperties local = new TransportProperties();
+		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
-		final TransportProperties remote = new TransportProperties();
+		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
-		final ContactId contactId = new ContactId(234);
+		ContactId contactId = new ContactId(234);
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();
@@ -131,20 +131,20 @@ public class ModemPluginTest extends BrambleTestCase {
 	@Test
 	public void testCreateConnectionWhenDialThrowsException() throws Exception {
 		Mockery context = new Mockery();
-		final ModemFactory modemFactory = context.mock(ModemFactory.class);
+		ModemFactory modemFactory = context.mock(ModemFactory.class);
-		final SerialPortList serialPortList =
+		SerialPortList serialPortList =
 				context.mock(SerialPortList.class);
-		final DuplexPluginCallback callback =
+		DuplexPluginCallback callback =
 				context.mock(DuplexPluginCallback.class);
-		final ModemPlugin plugin = new ModemPlugin(modemFactory,
+		ModemPlugin plugin = new ModemPlugin(modemFactory,
 				serialPortList, callback, 0);
-		final Modem modem = context.mock(Modem.class);
+		Modem modem = context.mock(Modem.class);
-		final TransportProperties local = new TransportProperties();
+		TransportProperties local = new TransportProperties();
 		local.put("iso3166", ISO_1336);
-		final TransportProperties remote = new TransportProperties();
+		TransportProperties remote = new TransportProperties();
 		remote.put("iso3166", ISO_1336);
 		remote.put("number", NUMBER);
-		final ContactId contactId = new ContactId(234);
+		ContactId contactId = new ContactId(234);
 		context.checking(new Expectations() {{
 			// start()
 			oneOf(serialPortList).getPortNames();

briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java

@@ -44,7 +44,6 @@ import org.briarproject.briar.api.sharing.event.InvitationResponseReceivedEvent;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
@@ -138,16 +137,13 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 	@Override
 	public void stopService() throws ServiceException {
 		// Clear all notifications
-		Future<Void> f = androidExecutor.runOnUiThread(new Callable<Void>() {
+		Future<Void> f = androidExecutor.runOnUiThread(() -> {
-			@Override
+			clearContactNotification();
-			public Void call() {
+			clearGroupMessageNotification();
-				clearContactNotification();
+			clearForumPostNotification();
-				clearGroupMessageNotification();
+			clearBlogPostNotification();
-				clearForumPostNotification();
+			clearIntroductionSuccessNotification();
-				clearBlogPostNotification();
+			return null;
-				clearIntroductionSuccessNotification();
-				return null;
-			}
 		});
 		try {
 			f.get();
@@ -236,44 +232,35 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 	}
 
 	private void loadSettings() {
-		dbExecutor.execute(new Runnable() {
+		dbExecutor.execute(() -> {
-			@Override
+			try {
-			public void run() {
+				settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-				try {
+			} catch (DbException e) {
-					settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
 			}
 		});
 	}
 
-	private void showContactNotification(final ContactId c) {
+	private void showContactNotification(ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (blockContacts) return;
-			public void run() {
+			if (c.equals(blockedContact)) return;
-				if (blockContacts) return;
+			Integer count = contactCounts.get(c);
-				if (c.equals(blockedContact)) return;
+			if (count == null) contactCounts.put(c, 1);
-				Integer count = contactCounts.get(c);
+			else contactCounts.put(c, count + 1);
-				if (count == null) contactCounts.put(c, 1);
+			contactTotal++;
-				else contactCounts.put(c, count + 1);
+			updateContactNotification(true);
-				contactTotal++;
-				updateContactNotification(true);
-			}
 		});
 	}
 
 	@Override
-	public void clearContactNotification(final ContactId c) {
+	public void clearContactNotification(ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			Integer count = contactCounts.remove(c);
-			public void run() {
+			if (count == null) return; // Already cleared
-				Integer count = contactCounts.remove(c);
+			contactTotal -= count;
-				if (count == null) return; // Already cleared
+			updateContactNotification(false);
-				contactTotal -= count;
-				updateContactNotification(false);
-			}
 		});
 	}
 
@@ -358,40 +345,30 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllContactNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearContactNotification);
-			public void run() {
-				clearContactNotification();
-			}
-		});
 	}
 
 	@UiThread
-	private void showGroupMessageNotification(final GroupId g) {
+	private void showGroupMessageNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (blockGroups) return;
-			public void run() {
+			if (g.equals(blockedGroup)) return;
-				if (blockGroups) return;
+			Integer count = groupCounts.get(g);
-				if (g.equals(blockedGroup)) return;
+			if (count == null) groupCounts.put(g, 1);
-				Integer count = groupCounts.get(g);
+			else groupCounts.put(g, count + 1);
-				if (count == null) groupCounts.put(g, 1);
+			groupTotal++;
-				else groupCounts.put(g, count + 1);
+			updateGroupMessageNotification(true);
-				groupTotal++;
-				updateGroupMessageNotification(true);
-			}
 		});
 	}
 
 	@Override
-	public void clearGroupMessageNotification(final GroupId g) {
+	public void clearGroupMessageNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			Integer count = groupCounts.remove(g);
-			public void run() {
+			if (count == null) return; // Already cleared
-				Integer count = groupCounts.remove(g);
+			groupTotal -= count;
-				if (count == null) return; // Already cleared
+			updateGroupMessageNotification(false);
-				groupTotal -= count;
-				updateGroupMessageNotification(false);
-			}
 		});
 	}
 
@@ -445,40 +422,30 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllGroupMessageNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearGroupMessageNotification);
-			public void run() {
-				clearGroupMessageNotification();
-			}
-		});
 	}
 
 	@UiThread
-	private void showForumPostNotification(final GroupId g) {
+	private void showForumPostNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (blockForums) return;
-			public void run() {
+			if (g.equals(blockedGroup)) return;
-				if (blockForums) return;
+			Integer count = forumCounts.get(g);
-				if (g.equals(blockedGroup)) return;
+			if (count == null) forumCounts.put(g, 1);
-				Integer count = forumCounts.get(g);
+			else forumCounts.put(g, count + 1);
-				if (count == null) forumCounts.put(g, 1);
+			forumTotal++;
-				else forumCounts.put(g, count + 1);
+			updateForumPostNotification(true);
-				forumTotal++;
-				updateForumPostNotification(true);
-			}
 		});
 	}
 
 	@Override
-	public void clearForumPostNotification(final GroupId g) {
+	public void clearForumPostNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			Integer count = forumCounts.remove(g);
-			public void run() {
+			if (count == null) return; // Already cleared
-				Integer count = forumCounts.remove(g);
+			forumTotal -= count;
-				if (count == null) return; // Already cleared
+			updateForumPostNotification(false);
-				forumTotal -= count;
-				updateForumPostNotification(false);
-			}
 		});
 	}
 
@@ -532,40 +499,30 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllForumPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearForumPostNotification);
-			public void run() {
-				clearForumPostNotification();
-			}
-		});
 	}
 
 	@UiThread
-	private void showBlogPostNotification(final GroupId g) {
+	private void showBlogPostNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (blockBlogs) return;
-			public void run() {
+			if (g.equals(blockedGroup)) return;
-				if (blockBlogs) return;
+			Integer count = blogCounts.get(g);
-				if (g.equals(blockedGroup)) return;
+			if (count == null) blogCounts.put(g, 1);
-				Integer count = blogCounts.get(g);
+			else blogCounts.put(g, count + 1);
-				if (count == null) blogCounts.put(g, 1);
+			blogTotal++;
-				else blogCounts.put(g, count + 1);
+			updateBlogPostNotification(true);
-				blogTotal++;
-				updateBlogPostNotification(true);
-			}
 		});
 	}
 
 	@Override
-	public void clearBlogPostNotification(final GroupId g) {
+	public void clearBlogPostNotification(GroupId g) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			Integer count = blogCounts.remove(g);
-			public void run() {
+			if (count == null) return; // Already cleared
-				Integer count = blogCounts.remove(g);
+			blogTotal -= count;
-				if (count == null) return; // Already cleared
+			updateBlogPostNotification(false);
-				blogTotal -= count;
-				updateBlogPostNotification(false);
-			}
 		});
 	}
 
@@ -606,22 +563,15 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				(Runnable) this::clearBlogPostNotification);
-			public void run() {
-				clearBlogPostNotification();
-			}
-		});
 	}
 
 	private void showIntroductionNotification() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (blockIntroductions) return;
-			public void run() {
+			introductionTotal++;
-				if (blockIntroductions) return;
+			updateIntroductionNotification();
-				introductionTotal++;
-				updateIntroductionNotification();
-			}
 		});
 	}
 
@@ -656,71 +606,41 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@Override
 	public void clearAllIntroductionNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(
-			@Override
+				this::clearIntroductionSuccessNotification);
-			public void run() {
+	}
-				clearIntroductionSuccessNotification();
+
-			}
+	@Override
+	public void blockNotification(GroupId g) {
+		androidExecutor.runOnUiThread((Runnable) () -> blockedGroup = g);
+	}
+
+	@Override
+	public void unblockNotification(GroupId g) {
+		androidExecutor.runOnUiThread(() -> {
+			if (g.equals(blockedGroup)) blockedGroup = null;
 		});
 	}
 
 	@Override
-	public void blockNotification(final GroupId g) {
+	public void blockContactNotification(ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockedContact = c);
-			@Override
-			public void run() {
-				blockedGroup = g;
-			}
-		});
 	}
 
 	@Override
-	public void unblockNotification(final GroupId g) {
+	public void unblockContactNotification(ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			if (c.equals(blockedContact)) blockedContact = null;
-			public void run() {
-				if (g.equals(blockedGroup)) blockedGroup = null;
-			}
-		});
-	}
-
-	@Override
-	public void blockContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				blockedContact = c;
-			}
-		});
-	}
-
-	@Override
-	public void unblockContactNotification(final ContactId c) {
-		androidExecutor.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				if (c.equals(blockedContact)) blockedContact = null;
-			}
 		});
 	}
 
 	@Override
 	public void blockAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockBlogs = true);
-			@Override
-			public void run() {
-				blockBlogs = true;
-			}
-		});
 	}
 
 	@Override
 	public void unblockAllBlogPostNotifications() {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread((Runnable) () -> blockBlogs = false);
-			@Override
-			public void run() {
-				blockBlogs = false;
-			}
-		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -80,7 +80,7 @@ public class AppModule {
 	@Provides
 	@Singleton
 	DatabaseConfig provideDatabaseConfig(Application app) {
-		final File dir = app.getApplicationContext().getDir("db", MODE_PRIVATE);
+		File dir = app.getApplicationContext().getDir("db", MODE_PRIVATE);
 		@MethodsNotNullByDefault
 		@ParametersNotNullByDefault
 		DatabaseConfig databaseConfig = new DatabaseConfig() {
@@ -132,7 +132,7 @@ public class AppModule {
 
 	@Provides
 	@Singleton
-	DevConfig provideDevConfig(final CryptoComponent crypto) {
+	DevConfig provideDevConfig(CryptoComponent crypto) {
 		@NotNullByDefault
 		DevConfig devConfig = new DevConfig() {
 

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -111,34 +111,31 @@ public class BriarService extends Service {
 		}.start();
 	}
 
-	private void showStartupFailureNotification(final StartResult result) {
+	private void showStartupFailureNotification(StartResult result) {
-		androidExecutor.runOnUiThread(new Runnable() {
+		androidExecutor.runOnUiThread(() -> {
-			@Override
+			NotificationCompat.Builder b =
-			public void run() {
+					new NotificationCompat.Builder(BriarService.this);
-				NotificationCompat.Builder b =
+			b.setSmallIcon(android.R.drawable.stat_notify_error);
-						new NotificationCompat.Builder(BriarService.this);
+			b.setContentTitle(getText(
-				b.setSmallIcon(android.R.drawable.stat_notify_error);
+					R.string.startup_failed_notification_title));
-				b.setContentTitle(getText(
+			b.setContentText(getText(
-						R.string.startup_failed_notification_title));
+					R.string.startup_failed_notification_text));
-				b.setContentText(getText(
+			Intent i = new Intent(BriarService.this,
-						R.string.startup_failed_notification_text));
+					StartupFailureActivity.class);
-				Intent i = new Intent(BriarService.this,
+			i.setFlags(FLAG_ACTIVITY_NEW_TASK);
-						StartupFailureActivity.class);
+			i.putExtra("briar.START_RESULT", result);
-				i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+			i.putExtra("briar.FAILURE_NOTIFICATION_ID",
-				i.putExtra("briar.START_RESULT", result);
+					FAILURE_NOTIFICATION_ID);
-				i.putExtra("briar.FAILURE_NOTIFICATION_ID",
+			b.setContentIntent(PendingIntent.getActivity(BriarService.this,
-						FAILURE_NOTIFICATION_ID);
+					0, i, FLAG_UPDATE_CURRENT));
-				b.setContentIntent(PendingIntent.getActivity(BriarService.this,
+			Object o = getSystemService(NOTIFICATION_SERVICE);
-						0, i, FLAG_UPDATE_CURRENT));
+			NotificationManager nm = (NotificationManager) o;
-				Object o = getSystemService(NOTIFICATION_SERVICE);
+			nm.notify(FAILURE_NOTIFICATION_ID, b.build());
-				NotificationManager nm = (NotificationManager) o;
+			// Bring the dashboard to the front to clear the back stack
-				nm.notify(FAILURE_NOTIFICATION_ID, b.build());
+			i = new Intent(BriarService.this, NavDrawerActivity.class);
-				// Bring the dashboard to the front to clear the back stack
+			i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
-				i = new Intent(BriarService.this, NavDrawerActivity.class);
+			i.putExtra("briar.STARTUP_FAILED", true);
-				i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+			startActivity(i);
-				i.putExtra("briar.STARTUP_FAILED", true);
-				startActivity(i);
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -151,12 +151,9 @@ public abstract class BaseActivity extends AppCompatActivity
 	}
 
 	@Override
-	public void runOnUiThreadUnlessDestroyed(final Runnable r) {
+	public void runOnUiThreadUnlessDestroyed(Runnable r) {
-		runOnUiThread(new Runnable() {
+		runOnUiThread(() -> {
-			@Override
+			if (!destroyed && !isFinishing()) r.run();
-			public void run() {
-				if (!destroyed && !isFinishing()) r.run();
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java

@@ -13,7 +13,6 @@ import android.view.Window;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.DbController;
-import org.briarproject.briar.android.controller.handler.ResultHandler;
 import org.briarproject.briar.android.login.PasswordActivity;
 import org.briarproject.briar.android.panic.ExitActivity;
 
@@ -98,21 +97,12 @@ public abstract class BriarActivity extends BaseActivity {
 		return toolbar;
 	}
 
-	protected void signOut(final boolean removeFromRecentApps) {
+	protected void signOut(boolean removeFromRecentApps) {
 		if (briarController.hasEncryptionKey()) {
 			// Don't use UiResultHandler because we want the result even if
 			// this activity has been destroyed
-			briarController.signOut(new ResultHandler<Void>() {
+			briarController.signOut(result -> runOnUiThread(
-				@Override
+					() -> exit(removeFromRecentApps)));
-				public void onResult(Void result) {
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							exit(removeFromRecentApps);
-						}
-					});
-				}
-			});
 		} else {
 			exit(removeFromRecentApps);
 		}
@@ -146,11 +136,6 @@ public abstract class BriarActivity extends BaseActivity {
 
 	@Deprecated
 	protected void finishOnUiThread() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(this::supportFinishAfterTransition);
-			@Override
-			public void run() {
-				supportFinishAfterTransition();
-			}
-		});
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java

@@ -84,39 +84,26 @@ abstract class BaseControllerImpl extends DbControllerImpl
 		this.listener = listener;
 	}
 
-	void onBlogPostAdded(final BlogPostHeader h, final boolean local) {
+	void onBlogPostAdded(BlogPostHeader h, boolean local) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onBlogPostAdded(h, local));
-			public void run() {
-				listener.onBlogPostAdded(h, local);
-			}
-		});
 	}
 
 	void onBlogRemoved() {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogRemoved());
-			@Override
-			public void run() {
-				listener.onBlogRemoved();
-			}
-		});
 	}
 
-
 	@Override
-	public void loadBlogPosts(final GroupId groupId,
+	public void loadBlogPosts(GroupId groupId,
-			final ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
+			ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				Collection<BlogPostItem> items = loadItems(groupId);
-				try {
+				handler.onResult(items);
-					Collection<BlogPostItem> items = loadItems(groupId);
+			} catch (DbException e) {
-					handler.onResult(items);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}
@@ -142,8 +129,8 @@ abstract class BaseControllerImpl extends DbControllerImpl
 	}
 
 	@Override
-	public void loadBlogPost(final BlogPostHeader header,
+	public void loadBlogPost(BlogPostHeader header,
-			final ResultExceptionHandler<BlogPostItem, DbException> handler) {
+			ResultExceptionHandler<BlogPostItem, DbException> handler) {
 
 		String body = bodyCache.get(header.getId());
 		if (body != null) {
@@ -151,28 +138,25 @@ abstract class BaseControllerImpl extends DbControllerImpl
 			handler.onResult(new BlogPostItem(header, body));
 			return;
 		}
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				BlogPostItem item = getItem(header);
-					long now = System.currentTimeMillis();
+				long duration = System.currentTimeMillis() - now;
-					BlogPostItem item = getItem(header);
+				if (LOG.isLoggable(INFO))
-					long duration = System.currentTimeMillis() - now;
+					LOG.info("Loading body took " + duration + " ms");
-					if (LOG.isLoggable(INFO))
+				handler.onResult(item);
-						LOG.info("Loading body took " + duration + " ms");
+			} catch (DbException e) {
-					handler.onResult(item);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}
 
 	@Override
-	public void loadBlogPost(final GroupId g, final MessageId m,
+	public void loadBlogPost(GroupId g, MessageId m,
-			final ResultExceptionHandler<BlogPostItem, DbException> handler) {
+			ResultExceptionHandler<BlogPostItem, DbException> handler) {
 
 		BlogPostHeader header = headerCache.get(m);
 		if (header != null) {
@@ -180,43 +164,36 @@ abstract class BaseControllerImpl extends DbControllerImpl
 			loadBlogPost(header, handler);
 			return;
 		}
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				BlogPostHeader header1 = getPostHeader(g, m);
-					long now = System.currentTimeMillis();
+				BlogPostItem item = getItem(header1);
-					BlogPostHeader header = getPostHeader(g, m);
+				long duration = System.currentTimeMillis() - now;
-					BlogPostItem item = getItem(header);
+				if (LOG.isLoggable(INFO))
-					long duration = System.currentTimeMillis() - now;
+					LOG.info("Loading post took " + duration + " ms");
-					if (LOG.isLoggable(INFO))
+				handler.onResult(item);
-						LOG.info("Loading post took " + duration + " ms");
+			} catch (DbException e) {
-					handler.onResult(item);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}
 
 	@Override
-	public void repeatPost(final BlogPostItem item,
+	public void repeatPost(BlogPostItem item, @Nullable String comment,
-			final @Nullable String comment,
+			ExceptionHandler<DbException> handler) {
-			final ExceptionHandler<DbException> handler) {
+		runOnDbThread(() -> {
-		runOnDbThread(new Runnable() {
+			try {
-			@Override
+				LocalAuthor a = identityManager.getLocalAuthor();
-			public void run() {
+				Blog b = blogManager.getPersonalBlog(a);
-				try {
+				BlogPostHeader h = item.getHeader();
-					LocalAuthor a = identityManager.getLocalAuthor();
+				blogManager.addLocalComment(a, b.getId(), comment, h);
-					Blog b = blogManager.getPersonalBlog(a);
+			} catch (DbException e) {
-					BlogPostHeader h = item.getHeader();
+				if (LOG.isLoggable(WARNING))
-					blogManager.addLocalComment(a, b.getId(), comment, h);
+					LOG.log(WARNING, e.toString(), e);
-				} catch (DbException e) {
+				handler.onException(e);
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}

briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java

@@ -99,13 +99,10 @@ abstract class BasePostFragment extends BaseFragment {
 	}
 
 	private void startPeriodicUpdate() {
-		refresher = new Runnable() {
+		refresher = () -> {
-			@Override
+			LOG.info("Updating Content...");
-			public void run() {
+			ui.updateDate(post.getTimestamp());
-				LOG.info("Updating Content...");
+			handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
-				ui.updateDate(post.getTimestamp());
-				handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
-			}
 		};
 		LOG.info("Adding Handler Callback");
 		handler.postDelayed(refresher, MIN_DATE_RESOLUTION);

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogActivity.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.blog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.view.View;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -33,7 +32,7 @@ public class BlogActivity extends BriarActivity
 		Intent i = getIntent();
 		byte[] b = i.getByteArrayExtra(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No group ID in intent");
-		final GroupId groupId = new GroupId(b);
+		GroupId groupId = new GroupId(b);
 		blogController.setGroupId(groupId);
 
 		setContentView(R.layout.activity_fragment_container_toolbar);
@@ -41,16 +40,12 @@ public class BlogActivity extends BriarActivity
 
 		// Open Sharing Status on Toolbar click
 		if (toolbar != null) {
-			toolbar.setOnClickListener(
+			toolbar.setOnClickListener(v -> {
-					new View.OnClickListener() {
+				Intent i1 = new Intent(BlogActivity.this,
-						@Override
+						BlogSharingStatusActivity.class);
-						public void onClick(View v) {
+				i1.putExtra(GROUP_ID, groupId.getBytes());
-							Intent i = new Intent(BlogActivity.this,
+				startActivity(i1);
-									BlogSharingStatusActivity.class);
+			});
-							i.putExtra(GROUP_ID, groupId.getBytes());
-							startActivity(i);
-						}
-					});
 		}
 
 		if (state == null) {

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java

@@ -125,108 +125,89 @@ class BlogControllerImpl extends BaseControllerImpl
 		}
 	}
 
-	private void onBlogInvitationAccepted(final ContactId c) {
+	private void onBlogInvitationAccepted(ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(
-			@Override
+				() -> listener.onBlogInvitationAccepted(c));
-			public void run() {
-				listener.onBlogInvitationAccepted(c);
-			}
-		});
 	}
 
-	private void onBlogLeft(final ContactId c) {
+	private void onBlogLeft(ContactId c) {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogLeft(c));
-			@Override
-			public void run() {
-				listener.onBlogLeft(c);
-			}
-		});
 	}
 
 	@Override
 	public void loadBlogPosts(
-			final ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
+			ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
 		loadBlogPosts(groupId, handler);
 	}
 
 	@Override
-	public void loadBlogPost(final MessageId m,
+	public void loadBlogPost(MessageId m,
-			final ResultExceptionHandler<BlogPostItem, DbException> handler) {
+			ResultExceptionHandler<BlogPostItem, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
 		loadBlogPost(groupId, m, handler);
 	}
 
 	@Override
 	public void loadBlog(
-			final ResultExceptionHandler<BlogItem, DbException> handler) {
+			ResultExceptionHandler<BlogItem, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				LocalAuthor a = identityManager.getLocalAuthor();
-					long now = System.currentTimeMillis();
+				Blog b = blogManager.getBlog(groupId);
-					LocalAuthor a = identityManager.getLocalAuthor();
+				boolean ours = a.getId().equals(b.getAuthor().getId());
-					Blog b = blogManager.getBlog(groupId);
+				boolean removable = blogManager.canBeRemoved(b);
-					boolean ours = a.getId().equals(b.getAuthor().getId());
+				BlogItem blog = new BlogItem(b, ours, removable);
-					boolean removable = blogManager.canBeRemoved(b);
+				long duration = System.currentTimeMillis() - now;
-					BlogItem blog = new BlogItem(b, ours, removable);
+				if (LOG.isLoggable(INFO))
-					long duration = System.currentTimeMillis() - now;
+					LOG.info("Loading blog took " + duration + " ms");
-					if (LOG.isLoggable(INFO))
+				handler.onResult(blog);
-						LOG.info("Loading blog took " + duration + " ms");
+			} catch (DbException e) {
-					handler.onResult(blog);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}
 
 	@Override
-	public void deleteBlog(
+	public void deleteBlog(ResultExceptionHandler<Void, DbException> handler) {
-			final ResultExceptionHandler<Void, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				Blog b = blogManager.getBlog(groupId);
-					long now = System.currentTimeMillis();
+				blogManager.removeBlog(b);
-					Blog b = blogManager.getBlog(groupId);
+				long duration = System.currentTimeMillis() - now;
-					blogManager.removeBlog(b);
+				if (LOG.isLoggable(INFO))
-					long duration = System.currentTimeMillis() - now;
+					LOG.info("Removing blog took " + duration + " ms");
-					if (LOG.isLoggable(INFO))
+				handler.onResult(null);
-						LOG.info("Removing blog took " + duration + " ms");
+			} catch (DbException e) {
-					handler.onResult(null);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}
 
 	@Override
 	public void loadSharingContacts(
-			final ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
 		if (groupId == null) throw new IllegalStateException();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				Collection<Contact> contacts =
-				try {
+						blogSharingManager.getSharedWith(groupId);
-					Collection<Contact> contacts =
+				Collection<ContactId> contactIds =
-							blogSharingManager.getSharedWith(groupId);
+						new ArrayList<>(contacts.size());
-					Collection<ContactId> contactIds =
+				for (Contact c : contacts) contactIds.add(c.getId());
-							new ArrayList<>(contacts.size());
+				handler.onResult(contactIds);
-					for (Contact c : contacts) contactIds.add(c.getId());
+			} catch (DbException e) {
-					handler.onResult(contactIds);
+				if (LOG.isLoggable(WARNING))
-				} catch (DbException e) {
+					LOG.log(WARNING, e.toString(), e);
-					if (LOG.isLoggable(WARNING))
+				handler.onException(e);
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java

@@ -137,7 +137,7 @@ public class BlogFragment extends BaseFragment
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.action_write_blog_post:
 				Intent i = new Intent(getActivity(),
@@ -184,7 +184,7 @@ public class BlogFragment extends BaseFragment
 	}
 
 	@Override
-	public void onBlogPostAdded(BlogPostHeader header, final boolean local) {
+	public void onBlogPostAdded(BlogPostHeader header, boolean local) {
 		blogController.loadBlogPost(header,
 				new UiResultExceptionHandler<BlogPostItem, DbException>(
 						this) {
@@ -224,7 +224,7 @@ public class BlogFragment extends BaseFragment
 		getContext().startActivity(i);
 	}
 
-	private void loadBlogPosts(final boolean reload) {
+	private void loadBlogPosts(boolean reload) {
 		blogController.loadBlogPosts(
 				new UiResultExceptionHandler<Collection<BlogPostItem>,
 						DbException>(this) {
@@ -331,12 +331,7 @@ public class BlogFragment extends BaseFragment
 				Snackbar.make(list, stringId, Snackbar.LENGTH_LONG);
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
 		if (scroll) {
-			View.OnClickListener onClick = new View.OnClickListener() {
+			View.OnClickListener onClick = v -> list.smoothScrollToPosition(0);
-				@Override
-				public void onClick(View v) {
-					list.smoothScrollToPosition(0);
-				}
-			};
 			snackbar.setActionTextColor(ContextCompat
 					.getColor(getContext(),
 							R.color.briar_button_positive));
@@ -347,12 +342,7 @@ public class BlogFragment extends BaseFragment
 
 	private void showDeleteDialog() {
 		DialogInterface.OnClickListener okListener =
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> deleteBlog();
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteBlog();
-					}
-				};
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_remove_blog));

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java

@@ -13,7 +13,6 @@ import android.support.v7.widget.RecyclerView;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -89,18 +88,13 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		return "blogPost" + id.hashCode();
 	}
 
-	void bindItem(@Nullable final BlogPostItem item) {
+	void bindItem(@Nullable BlogPostItem item) {
 		if (item == null) return;
 
 		setTransitionName(item.getId());
 		if (!fullText) {
 			layout.setClickable(true);
-			layout.setOnClickListener(new OnClickListener() {
+			layout.setOnClickListener(v -> listener.onBlogPostClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onBlogPostClick(item);
-				}
-			});
 		}
 
 		// author and date
@@ -113,12 +107,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 				item.isRssFeed() ? AuthorView.RSS_FEED : AuthorView.NORMAL);
 		// TODO make author clickable more often #624
 		if (!fullText && item.getHeader().getType() == POST) {
-			author.setAuthorClickable(new OnClickListener() {
+			author.setAuthorClickable(v -> listener.onAuthorClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onAuthorClick(item);
-				}
-			});
 		} else {
 			author.setAuthorNotClickable();
 		}
@@ -137,23 +126,20 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		}
 
 		// reblog button
-		reblogButton.setOnClickListener(new OnClickListener() {
+		reblogButton.setOnClickListener(v -> {
-			@Override
+			Intent i = new Intent(ctx, ReblogActivity.class);
-			public void onClick(View v) {
+			i.putExtra(GROUP_ID, item.getGroupId().getBytes());
-				Intent i = new Intent(ctx, ReblogActivity.class);
+			i.putExtra(POST_ID, item.getId().getBytes());
-				i.putExtra(GROUP_ID, item.getGroupId().getBytes());
-				i.putExtra(POST_ID, item.getId().getBytes());
 
-				if (Build.VERSION.SDK_INT >= 23) {
+			if (Build.VERSION.SDK_INT >= 23) {
-					ActivityOptionsCompat options =
+				ActivityOptionsCompat options =
-							makeSceneTransitionAnimation((Activity) ctx, layout,
+						makeSceneTransitionAnimation((Activity) ctx, layout,
-									getTransitionName(item.getId()));
+								getTransitionName(item.getId()));
-					ActivityCompat.startActivity((Activity) ctx, i,
+				ActivityCompat.startActivity((Activity) ctx, i,
-							options.toBundle());
+						options.toBundle());
-				} else {
+			} else {
-					// work-around for android bug #224270
+				// work-around for android bug #224270
-					ctx.startActivity(i);
+				ctx.startActivity(i);
-				}
 			}
 		});
 
@@ -166,18 +152,13 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 		}
 	}
 
-	private void onBindComment(final BlogCommentItem item) {
+	private void onBindComment(BlogCommentItem item) {
 		// reblogger
 		reblogger.setAuthor(item.getAuthor());
 		reblogger.setAuthorStatus(item.getAuthorStatus());
 		reblogger.setDate(item.getTimestamp());
 		if (!fullText) {
-			reblogger.setAuthorClickable(new OnClickListener() {
+			reblogger.setAuthorClickable(v -> listener.onAuthorClick(item));
-				@Override
-				public void onClick(View v) {
-					listener.onAuthorClick(item);
-				}
-			});
 		}
 		reblogger.setVisibility(VISIBLE);
 		reblogger.setPersona(AuthorView.REBLOGGER);

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedControllerImpl.java

@@ -91,63 +91,50 @@ class FeedControllerImpl extends BaseControllerImpl
 	}
 
 	private void onBlogAdded() {
-		listener.runOnUiThreadUnlessDestroyed(new Runnable() {
+		listener.runOnUiThreadUnlessDestroyed(() -> listener.onBlogAdded());
-			@Override
-			public void run() {
-				listener.onBlogAdded();
-			}
-		});
 	}
 
 	@Override
 	public void loadBlogPosts(
-			final ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
+			ResultExceptionHandler<Collection<BlogPostItem>, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				Collection<BlogPostItem> posts = new ArrayList<>();
-					long now = System.currentTimeMillis();
+				for (Blog b : blogManager.getBlogs()) {
-					Collection<BlogPostItem> posts = new ArrayList<>();
+					try {
-					for (Blog b : blogManager.getBlogs()) {
+						posts.addAll(loadItems(b.getId()));
-						try {
+					} catch (NoSuchGroupException | NoSuchMessageException e) {
-							posts.addAll(loadItems(b.getId()));
+						if (LOG.isLoggable(WARNING))
-						} catch (NoSuchGroupException | NoSuchMessageException e) {
+							LOG.log(WARNING, e.toString(), e);
-							if (LOG.isLoggable(WARNING))
-								LOG.log(WARNING, e.toString(), e);
-						}
 					}
-					long duration = System.currentTimeMillis() - now;
-					if (LOG.isLoggable(INFO))
-						LOG.info("Loading all posts took " + duration + " ms");
-					handler.onResult(posts);
-				} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
 				}
+				long duration = System.currentTimeMillis() - now;
+				if (LOG.isLoggable(INFO))
+					LOG.info("Loading all posts took " + duration + " ms");
+				handler.onResult(posts);
+			} catch (DbException e) {
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+				handler.onException(e);
 			}
 		});
 	}
 
 	@Override
 	public void loadPersonalBlog(
-			final ResultExceptionHandler<Blog, DbException> handler) {
+			ResultExceptionHandler<Blog, DbException> handler) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				long now = System.currentTimeMillis();
-				try {
+				Author a = identityManager.getLocalAuthor();
-					long now = System.currentTimeMillis();
+				Blog b = blogManager.getPersonalBlog(a);
-					Author a = identityManager.getLocalAuthor();
+				long duration = System.currentTimeMillis() - now;
-					Blog b = blogManager.getPersonalBlog(a);
+				if (LOG.isLoggable(INFO))
-					long duration = System.currentTimeMillis() - now;
+					LOG.info("Loading blog took " + duration + " ms");
-					if (LOG.isLoggable(INFO))
+				handler.onResult(b);
-						LOG.info("Loading blog took " + duration + " ms");
+			} catch (DbException e) {
-					handler.onResult(b);
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (DbException e) {
+				handler.onException(e);
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					handler.onException(e);
-				}
 			}
 		});
 	}

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java

@@ -135,8 +135,8 @@ public class FeedFragment extends BaseFragment implements
 				});
 	}
 
-	private void loadBlogPosts(final boolean clear) {
+	private void loadBlogPosts(boolean clear) {
-		final int revision = adapter.getRevision();
+		int revision = adapter.getRevision();
 		feedController.loadBlogPosts(
 				new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>(
 						this) {
@@ -167,7 +167,7 @@ public class FeedFragment extends BaseFragment implements
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
+	public boolean onOptionsItemSelected(MenuItem item) {
 		if (personalBlog == null) return false;
 		switch (item.getItemId()) {
 			case R.id.action_write_blog_post:
@@ -193,7 +193,7 @@ public class FeedFragment extends BaseFragment implements
 	}
 
 	@Override
-	public void onBlogPostAdded(BlogPostHeader header, final boolean local) {
+	public void onBlogPostAdded(BlogPostHeader header, boolean local) {
 		feedController.loadBlogPost(header,
 				new UiResultExceptionHandler<BlogPostItem, DbException>(
 						this) {
@@ -246,12 +246,7 @@ public class FeedFragment extends BaseFragment implements
 		Snackbar s = Snackbar.make(list, stringRes, LENGTH_LONG);
 		s.getView().setBackgroundResource(R.color.briar_primary);
 		if (scroll) {
-			OnClickListener onClick = new OnClickListener() {
+			OnClickListener onClick = v -> list.smoothScrollToPosition(0);
-				@Override
-				public void onClick(View v) {
-					list.smoothScrollToPosition(0);
-				}
-			};
 			s.setActionTextColor(ContextCompat
 					.getColor(getContext(),
 							R.color.briar_button_positive));

briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java

@@ -114,12 +114,7 @@ public class ReblogFragment extends BaseFragment implements TextInputListener {
 
 		ui.input.setListener(this);
 		ui.input.setSendButtonEnabled(true);
-		ui.scrollView.post(new Runnable() {
+		ui.scrollView.post(() -> ui.scrollView.fullScroll(FOCUS_DOWN));
-			@Override
-			public void run() {
-				ui.scrollView.fullScroll(FOCUS_DOWN);
-			}
-		});
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -35,19 +34,14 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> {
 
 	@Override
 	public void onBindViewHolder(FeedViewHolder ui, int position) {
-		final Feed item = getItemAt(position);
+		Feed item = getItemAt(position);
 		if (item == null) return;
 
 		// Feed Title
 		ui.title.setText(item.getTitle());
 
 		// Delete Button
-		ui.delete.setOnClickListener(new OnClickListener() {
+		ui.delete.setOnClickListener(v -> listener.onDeleteClick(item));
-			@Override
-			public void onClick(View v) {
-				listener.onDeleteClick(item);
-			}
-		});
 
 		// Author
 		if (item.getAuthor() != null) {
@@ -72,12 +66,7 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> {
 		}
 
 		// Open feed's blog when clicked
-		ui.layout.setOnClickListener(new OnClickListener() {
+		ui.layout.setOnClickListener(v -> listener.onFeedClick(item));
-			@Override
-			public void onClick(View v) {
-				listener.onFeedClick(item);
-			}
-		});
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedImportActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.blog;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -8,7 +7,6 @@ import android.text.TextWatcher;
 import android.util.Patterns;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -75,12 +73,7 @@ public class RssFeedImportActivity extends BriarActivity {
 		});
 
 		importButton = (Button) findViewById(R.id.importButton);
-		importButton.setOnClickListener(new View.OnClickListener() {
+		importButton.setOnClickListener(v -> publish());
-			@Override
-			public void onClick(View v) {
-				publish();
-			}
-		});
 
 		progressBar = (ProgressBar) findViewById(R.id.progressBar);
 	}
@@ -125,55 +118,38 @@ public class RssFeedImportActivity extends BriarActivity {
 		importFeed(url);
 	}
 
-	private void importFeed(final String url) {
+	private void importFeed(String url) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			try {
-			public void run() {
+				feedManager.addFeed(url);
-				try {
+				feedImported();
-					feedManager.addFeed(url);
+			} catch (DbException | IOException e) {
-					feedImported();
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (DbException | IOException e) {
+				importFailed();
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					importFailed();
-				}
 			}
 		});
 	}
 
 	private void feedImported() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(this::supportFinishAfterTransition);
-			@Override
-			public void run() {
-				supportFinishAfterTransition();
-			}
-		});
 	}
 
 	private void importFailed() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
+			// hide progress bar, show publish button
-			public void run() {
+			progressBar.setVisibility(GONE);
-				// hide progress bar, show publish button
+			importButton.setVisibility(VISIBLE);
-				progressBar.setVisibility(GONE);
-				importButton.setVisibility(VISIBLE);
 
-				// show error dialog
+			// show error dialog
-				AlertDialog.Builder builder =
+			AlertDialog.Builder builder =
-						new AlertDialog.Builder(RssFeedImportActivity.this,
+					new AlertDialog.Builder(RssFeedImportActivity.this,
-								R.style.BriarDialogTheme);
+							R.style.BriarDialogTheme);
-				builder.setMessage(R.string.blogs_rss_feeds_import_error);
+			builder.setMessage(R.string.blogs_rss_feeds_import_error);
-				builder.setNegativeButton(R.string.cancel, null);
+			builder.setNegativeButton(R.string.cancel, null);
-				builder.setPositiveButton(R.string.try_again_button,
+			builder.setPositiveButton(R.string.try_again_button,
-						new DialogInterface.OnClickListener() {
+					(dialog, which) -> publish());
-							@Override
+			AlertDialog dialog = builder.create();
-							public void onClick(DialogInterface dialog, int which) {
+			dialog.show();
-								publish();
-							}
-						});
-				AlertDialog dialog = builder.create();
-				dialog.show();
-			}
 		});
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java

@@ -103,14 +103,9 @@ public class RssFeedManageActivity extends BriarActivity
 	}
 
 	@Override
-	public void onDeleteClick(final Feed feed) {
+	public void onDeleteClick(Feed feed) {
 		DialogInterface.OnClickListener okListener =
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> deleteFeed(feed);
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteFeed(feed);
-					}
-				};
 		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_rss_remove_feed));
@@ -123,82 +118,60 @@ public class RssFeedManageActivity extends BriarActivity
 	}
 
 	private void loadFeeds() {
-		final int revision = adapter.getRevision();
+		int revision = adapter.getRevision();
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				displayFeeds(revision, feedManager.getFeeds());
-				try {
+			} catch (DbException e) {
-					displayFeeds(revision, feedManager.getFeeds());
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (DbException e) {
+				onLoadError();
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					onLoadError();
-				}
 			}
 		});
 	}
 
-	private void displayFeeds(final int revision, final List<Feed> feeds) {
+	private void displayFeeds(int revision, List<Feed> feeds) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
+			if (revision == adapter.getRevision()) {
-			public void run() {
+				adapter.incrementRevision();
-				if (revision == adapter.getRevision()) {
+				if (feeds.isEmpty()) list.showData();
-					adapter.incrementRevision();
+				else adapter.addAll(feeds);
-					if (feeds.isEmpty()) list.showData();
+			} else {
-					else adapter.addAll(feeds);
+				LOG.info("Concurrent update, reloading");
-				} else {
+				loadFeeds();
-					LOG.info("Concurrent update, reloading");
-					loadFeeds();
-				}
 			}
 		});
 	}
 
-	private void deleteFeed(final Feed feed) {
+	private void deleteFeed(Feed feed) {
-		runOnDbThread(new Runnable() {
+		runOnDbThread(() -> {
-			@Override
+			try {
-			public void run() {
+				feedManager.removeFeed(feed);
-				try {
+				onFeedDeleted(feed);
-					feedManager.removeFeed(feed);
+			} catch (DbException e) {
-					onFeedDeleted(feed);
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (DbException e) {
+				onDeleteError();
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					onDeleteError();
-				}
 			}
 		});
 	}
 
 	private void onLoadError() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
+			list.setEmptyText(R.string.blogs_rss_feeds_manage_error);
-			public void run() {
+			list.showData();
-				list.setEmptyText(R.string.blogs_rss_feeds_manage_error);
-				list.showData();
-			}
 		});
 	}
 
-	private void onFeedDeleted(final Feed feed) {
+	private void onFeedDeleted(Feed feed) {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> {
-			@Override
+			adapter.incrementRevision();
-			public void run() {
+			adapter.remove(feed);
-				adapter.incrementRevision();
-				adapter.remove(feed);
-			}
 		});
 	}
 
 	private void onDeleteError() {
-		runOnUiThreadUnlessDestroyed(new Runnable() {
+		runOnUiThreadUnlessDestroyed(() -> Snackbar.make(list,
-			@Override
+				R.string.blogs_rss_feeds_manage_delete_error,
-			public void run() {
+				LENGTH_LONG).show());
-				Snackbar.make(list,
-						R.string.blogs_rss_feeds_manage_delete_error,
-						LENGTH_LONG).show();
-			}
-		});
 	}
 }