github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-26 19:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved getConnectionString to the Settings class

Browse Source 
Former-commit-id: d35df6d103505888ac4d87f964d8d615996ce614
This commit is contained in:
Jeremy Long
2014-07-13 06:56:40 -04:00
parent 4b06d0fd87
commit e1179a8e22
1 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ import org.owasp.dependencycheck.utils.Settings;
* @author Jeremy Long <jeremy.long@owasp.org> * @author Jeremy Long <jeremy.long@owasp.org>
*/ */
public final class ConnectionFactory { public final class ConnectionFactory {
/** /**
* The Logger. * The Logger.
*/ */
@@ -111,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 = getConnectionString(); connectionString = Settings.getConnectionString(Settings.KEYS.DB_CONNECTION_STRING);
} 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);
@@ -217,41 +218,6 @@ public final class ConnectionFactory {
return conn; return conn;
} }
/**
* Returns the configured connection string. If using the embedded H2 database this function will also ensure the
* data directory exists and if not create it.
*
* @return the connection string
* @throws IOException thrown the data directory cannot be created
*/
private static String getConnectionString() throws IOException {
final String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, "jdbc:h2:file:%s;AUTO_SERVER=TRUE");
if (connStr.contains("%s")) {
final String directory = getDataDirectory().getCanonicalPath();
final File dataFile = new File(directory, "cve." + DB_SCHEMA_VERSION);
LOGGER.log(Level.FINE, String.format("File path for H2 file: '%s'", dataFile.toString()));
return String.format(connStr, dataFile.getAbsolutePath());
}
return connStr;
}
/**
* Retrieves the directory that the JAR file exists in so that we can ensure we always use a common data directory
* for the embedded H2 database. This is public solely for some unit tests; otherwise this should be private.
*
* @return the data directory to store data files
* @throws IOException is thrown if an IOException occurs of course...
*/
public static File getDataDirectory() throws IOException {
final File path = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
if (!path.exists()) {
if (!path.mkdirs()) {
throw new IOException("Unable to create NVD CVE Data directory");
}
}
return path;
}
/** /**
* Determines if the H2 database file exists. If it does not exist then the data structure will need to be created. * Determines if the H2 database file exists. If it does not exist then the data structure will need to be created.
* *
@@ -259,7 +225,7 @@ public final class ConnectionFactory {
* @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 dbSchemaExists() throws IOException {
final File dir = getDataDirectory(); final File dir = Settings.getDataDirectory();
final String name = String.format("cve.%s.h2.db", DB_SCHEMA_VERSION); final String name = String.format("cve.%s.h2.db", DB_SCHEMA_VERSION);
final File file = new File(dir, name); final File file = new File(dir, name);
return file.exists(); return file.exists();