Replace org.JSON with GSON

Removed the org.JSON dependency and replaced it with GSON.

pom.xml

@@ -14,12 +14,6 @@
 			<artifactId>gson</artifactId>
 			<version>2.7</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.json/json -->
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20160810</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
 		<dependency>
 			<groupId>commons-codec</groupId>

src/eu/tankernn/accounts/Account.java

@@ -5,16 +5,13 @@ import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 public class Account {
 	
 	private List<AccountEvent> history;
 	private String firstName, lastName, accountNumber;
 
 	public Account(String firstName, String lastName) {
+		// Generate a random, unique account id
 		do {
 			accountNumber = new BigInteger(20, new SecureRandom()).toString();
 		} while (AccountManager.getAccountByNumber(accountNumber).isPresent());
@@ -22,25 +19,6 @@ public class Account {
 		this.lastName = lastName;
 		this.history = new ArrayList<AccountEvent>();
 	}
-	
-	private Account(String accountNumber, String firstName, String lastName, List<AccountEvent> history) {
-		this(firstName, lastName);
-		this.accountNumber = accountNumber;
-		this.history = history;
-		calculateBalance();
-	}
-
-	public static Account fromJSON(JSONObject obj) throws JSONException {
-		List<AccountEvent> history = new ArrayList<AccountEvent>();
-		
-		JSONArray arr = obj.getJSONArray("history");
-		
-		for (int i = 0; i < arr.length(); i++) {
-			history.add(AccountEvent.fromJSON(arr.getJSONObject(i)));
-		}
-		
-		return new Account(obj.getString("accountNumber"), obj.getString("firstName"), obj.getString("lastName"), history);
-	}
 
 	public String getFirstName() {
 		return firstName;

src/eu/tankernn/accounts/AccountEvent.java

@@ -1,8 +1,5 @@
 package eu.tankernn.accounts;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 public class AccountEvent {
 	
 	private final double balanceChange;
@@ -12,15 +9,6 @@ public class AccountEvent {
 		this.balanceChange = balanceChange;
 		this.description = description;
 	}
-	
-	public static AccountEvent fromJSON(JSONObject obj) throws JSONException {
-		return new AccountEvent(obj.getDouble("balanceChange"), obj.getString("description"));
-		
-//		if (sender.isPresent() && receiver.isPresent())
-//			return new AccountEvent(sender.get(), receiver.get(), obj.getDouble("amount"));
-//		else
-//			throw new JSONException("The account with account number " + (sender.isPresent() ? obj.getDouble("receiver") : obj.getDouble("sender") + " could not be found."));
-	}
 
 	public double getBalanceChange() {
 		return balanceChange;

src/eu/tankernn/accounts/AccountManager.java

@@ -11,9 +11,8 @@ import java.util.Optional;
 
 import javax.swing.JOptionPane;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import eu.tankernn.accounts.frame.MainFrame;
 import eu.tankernn.accounts.frame.PasswordDialog;
@@ -23,6 +22,7 @@ import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
 
 public class AccountManager {
 	public static final String CURRENCY = "SEK";
+	public static final Gson GSON = new Gson();
 
 	private static String lastJSONString = "[]";
 	private static char[] lastPassword;
@@ -95,7 +95,7 @@ public class AccountManager {
 				}
 			} while (jsonString.toCharArray()[0] != '[');
 		}
-		
+
 		accounts = parseJSON(jsonString);
 		lastJSONString = jsonString;
 		window.refresh();
@@ -173,15 +173,9 @@ public class AccountManager {
 		}
 	}
 
-	private static List<Account> parseJSON(String jsonString) throws JSONException {
-		List<Account> parsedAccounts = new ArrayList<Account>();
-
-		JSONArray array = new JSONArray(jsonString);
-
-		for (int i = 0; i < array.length(); i++)
-			parsedAccounts.add(Account.fromJSON(array.getJSONObject(i)));
-
-		return parsedAccounts;
+	private static List<Account> parseJSON(String jsonString) {
+		return GSON.fromJson(jsonString, new TypeToken<ArrayList<Account>>() {
+		}.getType());
 	}
 
 	/**
@@ -191,10 +185,11 @@ public class AccountManager {
 	 *         current list of accounts.
 	 */
 	public static String exportJSON() {
-		JSONArray jsonArr = new JSONArray();
-		for (Account a : accounts)
-			jsonArr.put(new JSONObject(a));
-		return jsonArr.toString();
+//		JSONArray jsonArr = new JSONArray();
+//		for (Account a : accounts)
+//			jsonArr.put(new JSONObject(a));
+//		return jsonArr.toString();
+		return GSON.toJson(accounts);
 	}
 
 	public static boolean hasUnsavedChanges() {