CentralRepository getInstance will throw exception when CR is disabled

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepository.java

@@ -53,7 +53,7 @@ public interface CentralRepository {
             case SQLITE:
                 return SqliteCentralRepo.getInstance();
             default:
-                return null;
+                throw new CentralRepoException("Failed to get CentralRepository instance, Central Repositiory is not enabled.");
         }
     }
 

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java

@@ -127,16 +127,12 @@ public class PersonaAccount {
      * @param confidence    Confidence level.
      *
      * @return PersonaAccount
+     *
      * @throws CentralRepoException If there is an error in creating the
      *                              account.
      */
     static PersonaAccount addPersonaAccount(Persona persona, CentralRepoAccount account, String justification, Persona.Confidence confidence) throws CentralRepoException {
         CentralRepository cr = CentralRepository.getInstance();
-        
-        if(cr == null) {
-            throw new CentralRepoException("Failed to add Persona, Central Repository is not enable");
-        } 
-        
         CentralRepoExaminer currentExaminer = cr.getOrInsertExaminer(System.getProperty("user.name"));
 
         Instant instant = Instant.now();
@@ -151,7 +147,7 @@ public class PersonaAccount {
                 + currentExaminer.getId()
                 + ")";
 
-        CentralRepository.getInstance().executeInsertSQL(insertClause);
+        cr.executeInsertSQL(insertClause);
 
         String queryClause = PERSONA_ACCOUNTS_QUERY_CLAUSE
                 + "WHERE persona_id = " + persona.getId()
@@ -249,21 +245,15 @@ public class PersonaAccount {
      *                              persona_account.
      */
     static Collection<PersonaAccount> getPersonaAccountsForPersona(long personaId) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
-
-        if (cr != null) {
         String queryClause = PERSONA_ACCOUNTS_QUERY_CLAUSE
                 + " WHERE persona_accounts.persona_id = " + personaId;
 
         PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
 
         return queryCallback.getPersonaAccountsList();
     }
 
-        return new ArrayList<>();
-    }
-
     /**
      * Gets all the Persona for the specified Account.
      *
@@ -279,18 +269,12 @@ public class PersonaAccount {
                 + " WHERE persona_accounts.account_id = " + accountId
                 + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
 
-        CentralRepository cr = CentralRepository.getInstance();
-
-        if (cr != null) {
         PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
 
         return queryCallback.getPersonaAccountsList();
     }
 
-        return new ArrayList<>();
-    }
-
     /**
      * Gets all the Persona associated with all the accounts matching the given
      * account identifier substring.
@@ -308,17 +292,12 @@ public class PersonaAccount {
                 + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + accountIdentifierSubstring + "%')"
                 + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
 
-        CentralRepository cr = CentralRepository.getInstance();
-        if (cr != null) {
         PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
 
         return queryCallback.getPersonaAccountsList();
     }
 
-        return new ArrayList<>();
-    }
-
     /**
      * Gets all the Persona associated with the given account.
      *
@@ -335,14 +314,10 @@ public class PersonaAccount {
                 + " AND type_name = '" + account.getAccountType().getTypeName() + "' "
                 + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId();
 
-        CentralRepository cr = CentralRepository.getInstance();
-        if (cr != null) {
         PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
         return queryCallback.getPersonaAccountsList();
-        }
 
-        return new ArrayList<>();
     }
 
     /**
@@ -354,14 +329,8 @@ public class PersonaAccount {
      *                              account.
      */
     static void removePersonaAccount(long id) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
-        
-        if(cr == null) {
-            throw new CentralRepoException("Failed to remove persona account, Central Repo is not enabled");
-        }
-        
         String deleteClause = " DELETE FROM persona_accounts WHERE id = " + id;
-        cr.executeDeleteSQL(deleteClause);
+        CentralRepository.getInstance().executeDeleteSQL(deleteClause);
     }
 
     /**
@@ -373,14 +342,8 @@ public class PersonaAccount {
      *                              account.
      */
     static void modifyPersonaAccount(long id, Persona.Confidence confidence, String justification) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
-        
-        if (cr == null) {
-            throw new CentralRepoException("Failed to modify persona account, Central Repo is not enabled");
-        }
-        
         String updateClause = "UPDATE persona_accounts SET confidence_id = " + confidence.getLevelId() + ", justification = \"" + justification + "\" WHERE id = " + id;
-        cr.executeUpdateSQL(updateClause);
+        CentralRepository.getInstance().executeUpdateSQL(updateClause);
     }
 
     /**
@@ -419,13 +382,12 @@ public class PersonaAccount {
      *
      * @return Collection of all accounts associated with the given persona, may
      *         be empty.
+     *
      * @throws CentralRepoException If there is an error in getting the
      *                              accounts.
      */
     static Collection<CentralRepoAccount> getAccountsForPersona(long personaId) throws CentralRepoException {
-        CentralRepository cr = CentralRepository.getInstance();
 
-        if (cr != null) {
         String queryClause = "SELECT account_id,  "
                 + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier,"
                 + " account_types.type_name as type_name "
@@ -435,11 +397,9 @@ public class PersonaAccount {
                 + " WHERE persona_accounts.persona_id = " + personaId;
 
         AccountsForPersonaQueryCallback queryCallback = new AccountsForPersonaQueryCallback();
-            cr.executeSelectSQL(queryClause, queryCallback);
+        CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback);
 
         return queryCallback.getAccountsList();
-        }
 
-        return new ArrayList<>();
     }
 }