mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed classes to OsAccountsSearchParams and OsAccountsDAO

Browse Source
This commit is contained in:
Eugene Livis 2021-11-05 14:14:25 -04:00
parent 8de9085ad2
commit 5341b320eb
5 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Core/src/org/sleuthkit/autopsy/mainui/datamodel/Bundle.properties-MERGED
View File

@ -1,14 +1,3 @@
AccountsDAO.createSheet.comment.displayName=C
AccountsDAO.createSheet.comment.name=C
AccountsDAO.createSheet.count.displayName=O
AccountsDAO.createSheet.score.displayName=S
AccountsDAO.fileColumns.noDescription=No Description
AccountsDAO_accountHostNameProperty_displayName=Host
AccountsDAO_accountNameProperty_displayName=Name
AccountsDAO_accountRealmNameProperty_displayName=Realm Name
AccountsDAO_accountScopeNameProperty_displayName=Scope
AccountsDAO_createdTimeProperty_displayName=Creation Time
AccountsDAO_loginNameProperty_displayName=Login Name
AnalysisResultDAO.columnKeys.conclusion.description=Conclusion
AnalysisResultDAO.columnKeys.conclusion.displayName=Conclusion
AnalysisResultDAO.columnKeys.conclusion.name=Conclusion
@ -92,6 +81,17 @@ FileSystemColumnUtils.volumeColumns.length=Length in Sectors
FileSystemColumnUtils.volumeColumns.startingSector=Starting Sector
FileTag.name.text=File Tag
FileTypesByMimeType.name.text=By MIME Type
OsAccounts.name.text=OS Accounts
OsAccountsDAO.createSheet.comment.displayName=C
OsAccountsDAO.createSheet.count.displayName=O
OsAccountsDAO.createSheet.score.displayName=S
OsAccountsDAO.fileColumns.noDescription=No Description
OsAccountsDAO_accountHostNameProperty_displayName=Host
OsAccountsDAO_accountNameProperty_displayName=Name
OsAccountsDAO_accountRealmNameProperty_displayName=Realm Name
OsAccountsDAO_accountScopeNameProperty_displayName=Scope
OsAccountsDAO_createdTimeProperty_displayName=Creation Time
OsAccountsDAO_loginNameProperty_displayName=Login Name
ResultTag.name.text=Result Tag
TagsDAO.fileColumns.accessTimeColLbl=Accessed Time
TagsDAO.fileColumns.changeTimeColLbl=Changed Time

4
Core/src/org/sleuthkit/autopsy/mainui/datamodel/MainDAO.java
View File

@ -39,7 +39,7 @@ public class MainDAO {
private final ViewsDAO viewsDAO = ViewsDAO.getInstance();
private final FileSystemDAO fileSystemDAO = FileSystemDAO.getInstance();
private final TagsDAO tagsDAO = TagsDAO.getInstance();
private final AccountsDAO accountsDAO = AccountsDAO.getInstance();
private final OsAccountsDAO accountsDAO = OsAccountsDAO.getInstance();
public DataArtifactDAO getDataArtifactsDAO() {
return dataArtifactDAO;
@ -61,7 +61,7 @@ public class MainDAO {
return tagsDAO;
}
public AccountsDAO getAccountsDAO() {
public OsAccountsDAO getOsAccountsDAO() {
return accountsDAO;
}
}

60
Core/src/org/sleuthkit/autopsy/mainui/datamodel/AccountsDAO.java → Core/src/org/sleuthkit/autopsy/mainui/datamodel/OsAccountsDAO.java
View File

@ -44,17 +44,17 @@ import org.sleuthkit.datamodel.TskCoreException;
* Accounts section.
*/
@Messages({
"AccountsDAO_accountNameProperty_displayName=Name",
"AccountsDAO_accountRealmNameProperty_displayName=Realm Name",
"AccountsDAO_accountHostNameProperty_displayName=Host",
"AccountsDAO_accountScopeNameProperty_displayName=Scope",
"AccountsDAO_createdTimeProperty_displayName=Creation Time",
"AccountsDAO_loginNameProperty_displayName=Login Name",
"AccountsDAO.createSheet.score.displayName=S",
"AccountsDAO.createSheet.comment.displayName=C",
"AccountsDAO.createSheet.count.displayName=O",
"AccountsDAO.fileColumns.noDescription=No Description",})
public class AccountsDAO {
"OsAccountsDAO_accountNameProperty_displayName=Name",
"OsAccountsDAO_accountRealmNameProperty_displayName=Realm Name",
"OsAccountsDAO_accountHostNameProperty_displayName=Host",
"OsAccountsDAO_accountScopeNameProperty_displayName=Scope",
"OsAccountsDAO_createdTimeProperty_displayName=Creation Time",
"OsAccountsDAO_loginNameProperty_displayName=Login Name",
"OsAccountsDAO.createSheet.score.displayName=S",
"OsAccountsDAO.createSheet.comment.displayName=C",
"OsAccountsDAO.createSheet.count.displayName=O",
"OsAccountsDAO.fileColumns.noDescription=No Description",})
public class OsAccountsDAO {
private static final int CACHE_SIZE = 5; // rule of thumb: 5 entries times number of cached SearchParams sub-types
private static final long CACHE_DURATION = 2;
@ -64,38 +64,38 @@ public class AccountsDAO {
private static final String OS_ACCOUNTS_TYPE_ID = "OS_ACCOUNTS";
private static final List<ColumnKey> OS_ACCOUNTS_WITH_SCO_COLUMNS = Arrays.asList(
getFileColumnKey(Bundle.AccountsDAO_accountNameProperty_displayName()),
getFileColumnKey(Bundle.AccountsDAO_createSheet_score_displayName()),
getFileColumnKey(Bundle.AccountsDAO_createSheet_comment_displayName()),
getFileColumnKey(Bundle.AccountsDAO_createSheet_count_displayName()),
getFileColumnKey(Bundle.AccountsDAO_loginNameProperty_displayName()),
getFileColumnKey(Bundle.AccountsDAO_accountHostNameProperty_displayName()),
getFileColumnKey(Bundle.AccountsDAO_accountScopeNameProperty_displayName()),
getFileColumnKey(Bundle.AccountsDAO_accountRealmNameProperty_displayName()),
getFileColumnKey(Bundle.AccountsDAO_createdTimeProperty_displayName()));
getFileColumnKey(Bundle.OsAccountsDAO_accountNameProperty_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_createSheet_score_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_createSheet_comment_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_createSheet_count_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_loginNameProperty_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_accountHostNameProperty_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_accountScopeNameProperty_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_accountRealmNameProperty_displayName()),
getFileColumnKey(Bundle.OsAccountsDAO_createdTimeProperty_displayName()));
private static AccountsDAO instance = null;
private static OsAccountsDAO instance = null;
synchronized static AccountsDAO getInstance() {
synchronized static OsAccountsDAO getInstance() {
if (instance == null) {
instance = new AccountsDAO();
instance = new OsAccountsDAO();
}
return instance;
}
private static ColumnKey getFileColumnKey(String name) {
return new ColumnKey(name, name, Bundle.AccountsDAO_fileColumns_noDescription());
return new ColumnKey(name, name, Bundle.OsAccountsDAO_fileColumns_noDescription());
}
public SearchResultsDTO getAccounts(AccountsSearchParams key, long startItem, Long maxCount, boolean hardRefresh) throws ExecutionException, IllegalArgumentException {
public SearchResultsDTO getAccounts(OsAccountsSearchParams key, long startItem, Long maxCount, boolean hardRefresh) throws ExecutionException, IllegalArgumentException {
if (key == null) {
throw new IllegalArgumentException("Search parameters are null");
} else if (key.getDataSourceId() != null && key.getDataSourceId() <= 0) {
throw new IllegalArgumentException("Data source id must be greater than 0 or null");
}
SearchParams<AccountsSearchParams> searchParams = new SearchParams<>(key, startItem, maxCount);
SearchParams<OsAccountsSearchParams> searchParams = new SearchParams<>(key, startItem, maxCount);
if (hardRefresh) {
this.searchParamsCache.invalidate(searchParams);
}
@ -124,7 +124,7 @@ public class AccountsDAO {
}
@NbBundle.Messages({"OsAccounts.name.text=OS Accounts"})
private SearchResultsDTO fetchAccountsDTOs(SearchParams<AccountsSearchParams> cacheKey) throws NoCurrentCaseException, TskCoreException {
private SearchResultsDTO fetchAccountsDTOs(SearchParams<OsAccountsSearchParams> cacheKey) throws NoCurrentCaseException, TskCoreException {
Long dataSourceId = cacheKey.getParamData().getDataSourceId();
@ -169,20 +169,20 @@ public class AccountsDAO {
/**
* Handles fetching and paging of data for accounts.
*/
public static class AccountFetcher extends DAOFetcher<AccountsSearchParams> {
public static class AccountFetcher extends DAOFetcher<OsAccountsSearchParams> {
/**
* Main constructor.
*
* @param params Parameters to handle fetching of data.
*/
public AccountFetcher(AccountsSearchParams params) {
public AccountFetcher(OsAccountsSearchParams params) {
super(params);
}
@Override
public SearchResultsDTO getSearchResults(int pageSize, int pageIdx, boolean hardRefresh) throws ExecutionException {
return MainDAO.getInstance().getAccountsDAO().getAccounts(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh);
return MainDAO.getInstance().getOsAccountsDAO().getAccounts(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh);
}
@Override

6
Core/src/org/sleuthkit/autopsy/mainui/datamodel/AccountsSearchParams.java → Core/src/org/sleuthkit/autopsy/mainui/datamodel/OsAccountsSearchParams.java
View File

@ -23,11 +23,11 @@ import java.util.Objects;
/**
* Key for accessing data about OS Accounts from the DAO.
*/
public class AccountsSearchParams {
public class OsAccountsSearchParams {
private final Long dataSourceId;
public AccountsSearchParams(Long dataSourceId) {
public OsAccountsSearchParams(Long dataSourceId) {
this.dataSourceId = dataSourceId;
}
@ -53,7 +53,7 @@ public class AccountsSearchParams {
if (getClass() != obj.getClass()) {
return false;
}
final AccountsSearchParams other = (AccountsSearchParams) obj;
final OsAccountsSearchParams other = (OsAccountsSearchParams) obj;
if (!Objects.equals(this.dataSourceId, other.dataSourceId)) {
return false;
}

8
Core/test/qa-functional/src/org/sleuthkit/autopsy/mainui/datamodel/TableSearchTest.java
View File

@ -792,22 +792,22 @@ public class TableSearchTest extends NbTestCase {
assertTrue(db != null);
try {
AccountsDAO accountsDAO = MainDAO.getInstance().getAccountsDAO();
OsAccountsDAO accountsDAO = MainDAO.getInstance().getOsAccountsDAO();
// Get OS Accounts from data source 1
AccountsSearchParams param = new AccountsSearchParams(dataSource1.getId());
OsAccountsSearchParams param = new OsAccountsSearchParams(dataSource1.getId());
SearchResultsDTO results = accountsDAO.getAccounts(param, 0, null, false);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get OS Accounts from all data sources
param = new AccountsSearchParams(null);
param = new OsAccountsSearchParams(null);
results = accountsDAO.getAccounts(param, 0, null, false);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get OS Accounts from data source 1
param = new AccountsSearchParams(dataSource2.getId());
param = new OsAccountsSearchParams(dataSource2.getId());
results = accountsDAO.getAccounts(param, 0, null, false);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());