Merged in develop and addressed codacy

This commit is contained in:
U-BASIS\dsmyda 2020-03-26 12:19:13 -04:00
parent a48f5ba966
commit 0775c238ea
2 changed files with 3 additions and 5 deletions

View File

@ -66,10 +66,8 @@ public class CentralRepoAccountsTest extends TestCase {
sqliteSettings.setDbName(CR_DB_NAME); sqliteSettings.setDbName(CR_DB_NAME);
sqliteSettings.setDbDirectory(testDirectory.toString()); sqliteSettings.setDbDirectory(testDirectory.toString());
if (!sqliteSettings.dbDirectoryExists()) { if (!sqliteSettings.dbDirectoryExists() && !sqliteSettings.createDbDirectory()) {
if (!sqliteSettings.createDbDirectory()) { Assert.fail("Failed to create central repo directory.");
Assert.fail("Failed to create central repo directory.");
}
} }
RdbmsCentralRepoFactory factory = new RdbmsCentralRepoFactory(CentralRepoPlatforms.SQLITE, sqliteSettings); RdbmsCentralRepoFactory factory = new RdbmsCentralRepoFactory(CentralRepoPlatforms.SQLITE, sqliteSettings);

View File

@ -220,7 +220,7 @@ class InterCaseTestUtils {
this.kitchenShink = new IngestJobSettings(InterCaseTestUtils.class.getCanonicalName(), IngestType.ALL_MODULES, kitchenSink); this.kitchenShink = new IngestJobSettings(InterCaseTestUtils.class.getCanonicalName(), IngestType.ALL_MODULES, kitchenSink);
try { try {
Collection<CorrelationAttributeInstance.Type> types = CentralRepository.getInstance().getCorrelationTypes(); Collection<CorrelationAttributeInstance.Type> types = CentralRepository.getInstance().getDefinedCorrelationTypes();
//TODO use ids instead of strings //TODO use ids instead of strings
FILE_TYPE = types.stream().filter(type -> type.getDisplayName().equals("Files")).findAny().get(); FILE_TYPE = types.stream().filter(type -> type.getDisplayName().equals("Files")).findAny().get();