github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-18 07:14:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated to use the new getConnectionString implementation

Browse Source 
Former-commit-id: c5bd68b3d2fb4c2470d6c50dc5f8f9f6036b9fce
This commit is contained in:
Jeremy Long
2014-07-19 07:38:51 -04:00
parent 860d3d9c8b
commit 718d7af8bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
View File

@@ -50,7 +50,7 @@ public final class ConnectionFactory {
/** /**
* The version of the current DB Schema. * The version of the current DB Schema.
*/ */
public static final String DB_SCHEMA_VERSION = "2.9"; public static final String DB_SCHEMA_VERSION = Settings.getString(Settings.KEYS.DB_VERSION);
/** /**
* Resource location for SQL file used to create the database schema. * Resource location for SQL file used to create the database schema.
*/ */
@@ -112,7 +112,7 @@ public final class ConnectionFactory {
//yes, yes - hard-coded password - only if there isn't one in the properties file. //yes, yes - hard-coded password - only if there isn't one in the properties file.
password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!"); password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!");
try { try {
connectionString = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING); connectionString = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING, Settings.KEYS.DB_FILE_NAME, Settings.KEYS.DB_VERSION);
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.FINE, LOGGER.log(Level.FINE,
"Unable to retrieve the database connection string", ex); "Unable to retrieve the database connection string", ex);
@@ -121,7 +121,7 @@ public final class ConnectionFactory {
boolean shouldCreateSchema = false; boolean shouldCreateSchema = false;
try { try {
if (connectionString.startsWith("jdbc:h2:file:")) { //H2 if (connectionString.startsWith("jdbc:h2:file:")) { //H2
shouldCreateSchema = !dbSchemaExists(); shouldCreateSchema = !h2DataFileExists();
LOGGER.log(Level.FINE, "Need to create DB Structure: {0}", shouldCreateSchema); LOGGER.log(Level.FINE, "Need to create DB Structure: {0}", shouldCreateSchema);
} }
} catch (IOException ioex) { } catch (IOException ioex) {
@@ -224,9 +224,10 @@ public final class ConnectionFactory {
* @return true if the H2 database file does not exist; otherwise false * @return true if the H2 database file does not exist; otherwise false
* @throws IOException thrown if the data directory does not exist and cannot be created * @throws IOException thrown if the data directory does not exist and cannot be created
*/ */
private static boolean dbSchemaExists() throws IOException { private static boolean h2DataFileExists() throws IOException {
final File dir = Settings.getDataDirectory(); final File dir = Settings.getDataDirectory();
final String name = String.format("cve.%s.h2.db", DB_SCHEMA_VERSION); String name = Settings.getString(Settings.KEYS.DB_FILE_NAME);
final String fileName = String.format(name, DB_SCHEMA_VERSION);
final File file = new File(dir, name); final File file = new File(dir, name);
return file.exists(); return file.exists();
} }