Surround RepositoryManager.getRepository() calls within try-with-resources

src/qora/block/Block.java

@@ -89,6 +89,8 @@ public class Block {
 		this.generator = generator;
 		this.blockData = new BlockData(version, reference, 0, BigDecimal.ZERO.setScale(8), null, 0, timestamp, generatingBalance, generator.getPublicKey(),
 				null, atBytes, atFees);
+
+		this.transactions = new ArrayList<Transaction>();
 	}
 
 	// Getters/setters

src/qora/block/BlockChain.java

@@ -46,7 +46,8 @@ public class BlockChain {
 	}
 
 	private static boolean isGenesisBlockValid() throws DataException {
-		BlockRepository blockRepository = RepositoryManager.getRepository().getBlockRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
+			BlockRepository blockRepository = repository.getBlockRepository();
 
 			int blockchainHeight = blockRepository.getBlockchainHeight();
 			if (blockchainHeight < 1)
@@ -58,10 +59,11 @@ public class BlockChain {
 
 			return GenesisBlock.isGenesisBlock(blockData);
 		}
+	}
 
 	private static void rebuildBlockchain() throws DataException {
 		// (Re)build repository
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			repository.rebuild();
 
 			// Add Genesis Block
@@ -70,12 +72,13 @@ public class BlockChain {
 
 			// Add QORA asset.
 			// NOTE: Asset's transaction reference is Genesis Block's generator signature which doesn't exist as a transaction!
-		AssetData qoraAssetData = new AssetData(Asset.QORA, genesisBlock.getGenerator().getAddress(), "Qora", "This is the simulated Qora asset.", 10_000_000_000L, true,
+			AssetData qoraAssetData = new AssetData(Asset.QORA, genesisBlock.getGenerator().getAddress(), "Qora", "This is the simulated Qora asset.",
-				genesisBlock.getBlockData().getGeneratorSignature());
+					10_000_000_000L, true, genesisBlock.getBlockData().getGeneratorSignature());
 			repository.getAssetRepository().save(qoraAssetData);
 
 			repository.saveChanges();
 		}
+	}
 
 	/**
 	 * Return Qora balance adjusted to within min/max limits.

src/qora/block/GenesisBlock.java

@@ -3,6 +3,7 @@ package qora.block;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Arrays;
 
 import com.google.common.primitives.Bytes;
@@ -32,6 +33,8 @@ public class GenesisBlock extends Block {
 		super(repository, new BlockData(GENESIS_BLOCK_VERSION, GENESIS_REFERENCE, 0, BigDecimal.ZERO.setScale(8), GENESIS_TRANSACTIONS_SIGNATURE, 1,
 				GENESIS_TIMESTAMP, GENESIS_GENERATING_BALANCE, GENESIS_GENERATOR_PUBLIC_KEY, GENESIS_GENERATOR_SIGNATURE, null, null));
 
+		this.transactions = new ArrayList<Transaction>();
+
 		// Genesis transactions
 		addGenesisTransaction("QUD9y7NZqTtNwvSAUfewd7zKUGoVivVnTW", "7032468.191");
 		addGenesisTransaction("QVafvKkE5bZTkq8PcXvdaxwuLNN2DGCwYk", "1716146.084");

src/repository/Repository.java

@@ -1,6 +1,6 @@
 package repository;
 
-public interface Repository {
+public interface Repository extends AutoCloseable {
 
 	public AccountRepository getAccountRepository();
 

src/test/BlockTests.java

@@ -22,7 +22,7 @@ public class BlockTests extends Common {
 
 	@Test
 	public void testGenesisBlockTransactions() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			GenesisBlock block = new GenesisBlock(repository);
 
 			assertNotNull(block);
@@ -59,11 +59,11 @@ public class BlockTests extends Common {
 			assertTrue(transaction.isSignatureValid());
 			assertEquals(Transaction.ValidationResult.OK, transaction.isValid());
 		}
+	}
 
 	@Test
 	public void testBlockPaymentTransactions() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
-
 			// Block 949 has lots of varied transactions
 			// Blocks 390 & 754 have only payment transactions
 			BlockData blockData = repository.getBlockRepository().fromHeight(754);
@@ -100,11 +100,11 @@ public class BlockTests extends Common {
 
 			assertTrue(transaction.isSignatureValid());
 		}
+	}
 
 	@Test
 	public void testBlockSerialization() throws DataException, TransformationException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
-
 			// Block 949 has lots of varied transactions
 			// Blocks 390 & 754 have only payment transactions
 			BlockData blockData = repository.getBlockRepository().fromHeight(754);
@@ -117,5 +117,6 @@ public class BlockTests extends Common {
 
 			assertEquals(BlockTransformer.getDataLength(block), bytes.length);
 		}
+	}
 
 }

src/test/LoadTests.java

@@ -18,7 +18,7 @@ public class LoadTests extends Common {
 
 	@Test
 	public void testLoadPaymentTransaction() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			TransactionRepository transactionRepository = repository.getTransactionRepository();
 
 			assertTrue("Migrate from old database to at least block 49778 before running this test",
@@ -29,7 +29,7 @@ public class LoadTests extends Common {
 
 			TransactionData transactionData = transactionRepository.fromSignature(signature);
 			assertNotNull("Transaction data not loaded from repository", transactionData);
-		assertEquals("Transaction data not PAYMENT type", TransactionType.PAYMENT, transactionData.getType().value);
+			assertEquals("Transaction data not PAYMENT type", TransactionType.PAYMENT, transactionData.getType());
 			assertEquals(PublicKeyAccount.getAddress(transactionData.getCreatorPublicKey()), "QXwu8924WdgPoRmtiWQBUMF6eedmp1Hu2E");
 
 			PaymentTransactionData paymentTransactionData = (PaymentTransactionData) transactionData;
@@ -41,10 +41,11 @@ public class LoadTests extends Common {
 			assertEquals(Base58.encode(paymentTransactionData.getReference()),
 					"31dC6kHHBeG5vYb8LMaZDjLEmhc9kQB2VUApVd8xWncSRiXu7yMejdprjYFMP2rUnzZxWd4KJhkq6LsV7rQvU1kY");
 		}
+	}
 
 	@Test
 	public void testLoadFactory() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			TransactionRepository transactionRepository = repository.getTransactionRepository();
 
 			assertTrue("Migrate from old database to at least block 49778 before running this test",
@@ -65,10 +66,11 @@ public class LoadTests extends Common {
 				signature = paymentTransactionData.getReference();
 			}
 		}
+	}
 
 	@Test
 	public void testLoadNonexistentTransaction() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			TransactionRepository transactionRepository = repository.getTransactionRepository();
 
 			String signature58 = "1111222233334444";
@@ -85,5 +87,6 @@ public class LoadTests extends Common {
 				fail();
 			}
 		}
+	}
 
 }

src/test/NavigationTests.java

@@ -17,7 +17,7 @@ public class NavigationTests extends Common {
 
 	@Test
 	public void testNavigateFromTransactionToBlock() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			TransactionRepository transactionRepository = repository.getTransactionRepository();
 
 			assertTrue("Migrate from old database to at least block 49778 before running this test",
@@ -30,7 +30,7 @@ public class NavigationTests extends Common {
 
 			TransactionData transactionData = transactionRepository.fromSignature(signature);
 			assertNotNull("Transaction data not loaded from repository", transactionData);
-		assertEquals("Transaction data not PAYMENT type", TransactionType.PAYMENT, transactionData.getType().value);
+			assertEquals("Transaction data not PAYMENT type", TransactionType.PAYMENT, transactionData.getType());
 
 			BlockData blockData = transactionRepository.toBlock(transactionData);
 			assertNotNull("Block 49778 not loaded from database", blockData);
@@ -39,5 +39,6 @@ public class NavigationTests extends Common {
 
 			assertEquals(49778, blockData.getHeight());
 		}
+	}
 
 }

src/test/RepositoryTests.java

@@ -12,9 +12,10 @@ public class RepositoryTests extends Common {
 
 	@Test
 	public void testGetRepository() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			assertNotNull(repository);
 		}
+	}
 
 	@Test
 	public void testMultipleInstances() throws DataException {
@@ -25,19 +26,24 @@ public class RepositoryTests extends Common {
 			repositories[i] = RepositoryManager.getRepository();
 			assertNotNull(repositories[i]);
 		}
+
+		for (int i = 0; i < n_instances; ++i) {
+			repositories[i].close();
+			repositories[i] = null;
+		}
 	}
 
 	@Test
-	public void testAccessAfterCommit() throws DataException {
+	public void testAccessAfterClose() throws DataException {
 		Repository repository = RepositoryManager.getRepository();
 		assertNotNull(repository);
 
-		repository.saveChanges();
+		repository.close();
 
 		try {
 			repository.discardChanges();
 			fail();
-		} catch (DataException e) {
+		} catch (NullPointerException | DataException e) {
 		}
 	}
 

src/test/SaveTests.java

@@ -16,8 +16,7 @@ public class SaveTests extends Common {
 
 	@Test
 	public void testSavePaymentTransaction() throws DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
-
 			String reference58 = "rrrr";
 			byte[] reference = Base58.decode(reference58);
 			String signature58 = "ssss";
@@ -29,5 +28,6 @@ public class SaveTests extends Common {
 
 			repository.getTransactionRepository().save(paymentTransactionData);
 		}
+	}
 
 }

src/test/SignatureTests.java

@@ -22,14 +22,16 @@ public class SignatureTests extends Common {
 	public void testGenesisBlockSignature() throws DataException {
 		String expected58 = "6pHMBFif7jXFG654joT8GPaymau1fMtaxacRyqSrnAwQMQDvqRuLpHpfFyqX4gWVvj4pF1mwQhFgqWAvjVvPJUjmBZQvL751dM9cEcQBTaUcxtNLuWZCVUAtbnWN9f7FsLppHhkPbxwpoodL3UJYRGt3EZrG17mhv1RJbmq8j6rr7Mk";
 
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			GenesisBlock block = new GenesisBlock(repository);
 			BlockData blockData = block.getBlockData();
 
-		System.out.println("Generator: " + block.getGenerator().getAddress() + ", generator signature: " + Base58.encode(blockData.getGeneratorSignature()));
+			System.out
+					.println("Generator: " + block.getGenerator().getAddress() + ", generator signature: " + Base58.encode(blockData.getGeneratorSignature()));
 
 			assertEquals(expected58, Base58.encode(block.getSignature()));
 		}
+	}
 
 	@Test
 	public void testBlockSignature() throws DataException {
@@ -42,7 +44,7 @@ public class SignatureTests extends Common {
 
 		BigDecimal generatingBalance = BigDecimal.valueOf(10_000_000L).setScale(8);
 
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			PrivateKeyAccount generator = new PrivateKeyAccount(repository,
 					new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 });
 
@@ -57,5 +59,6 @@ public class SignatureTests extends Common {
 
 			assertTrue(block.isSignatureValid());
 		}
+	}
 
 }

src/test/TransactionTests.java

@@ -25,7 +25,7 @@ public class TransactionTests extends Common {
 
 	@Test
 	public void testGenesisSerialization() throws TransformationException, DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
 			GenesisBlock block = new GenesisBlock(repository);
 
 			GenesisTransaction transaction = (GenesisTransaction) block.getTransactions().get(1);
@@ -45,6 +45,7 @@ public class TransactionTests extends Common {
 
 			assertTrue(Arrays.equals(genesisTransactionData.getSignature(), parsedTransactionData.getSignature()));
 		}
+	}
 
 	private void testGenericSerialization(TransactionData transactionData) throws TransformationException {
 		assertNotNull(transactionData);
@@ -60,8 +61,7 @@ public class TransactionTests extends Common {
 
 	@Test
 	public void testPaymentSerialization() throws TransformationException, DataException {
-		Repository repository = RepositoryManager.getRepository();
+		try (final Repository repository = RepositoryManager.getRepository()) {
-
 			// Block 949 has lots of varied transactions
 			// Blocks 390 & 754 have only payment transactions
 			BlockData blockData = repository.getBlockRepository().fromHeight(754);
@@ -76,6 +76,7 @@ public class TransactionTests extends Common {
 			for (Transaction transaction : transactions)
 				testGenericSerialization(transaction.getTransactionData());
 		}
+	}
 
 	@Test
 	public void testMessageSerialization() throws SQLException, TransformationException {