From 27daccfc35cd0440cdb2e59f78f2c4b37be269cc Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 4 Jan 2014 09:01:04 -0500 Subject: [PATCH] moved several classes Former-commit-id: 16322c61d505a25eb1037a90e2ca941147fad6cf --- .../java/org/owasp/dependencycheck/Engine.java | 2 +- .../data/nvdcve/DatabaseProperties.java | 2 +- .../data/update/CachedWebDataSource.java | 2 -- ...{DatabaseUpdater.java => NvdCveUpdater.java} | 17 ++++++++--------- .../data/update/ProcessTask.java | 1 - .../data/update/StandardUpdate.java | 1 - .../{ => data}/update/UpdateException.java | 2 +- ...asp.dependencycheck.data.CachedWebDataSource | 1 - ...endencycheck.data.update.CachedWebDataSource | 1 + .../update/DatabaseUpdaterIntegrationTest.java | 4 ++-- .../update/StandardUpdateIntegrationTest.java | 1 - 11 files changed, 14 insertions(+), 20 deletions(-) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{DatabaseUpdater.java => NvdCveUpdater.java} (78%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => data}/update/UpdateException.java (97%) delete mode 100644 dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource create mode 100644 dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index facd5da02..d807bf137 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -35,7 +35,7 @@ import org.owasp.dependencycheck.analyzer.Analyzer; import org.owasp.dependencycheck.analyzer.AnalyzerService; import org.owasp.dependencycheck.data.update.CachedWebDataSource; import org.owasp.dependencycheck.exception.NoDataException; -import org.owasp.dependencycheck.update.UpdateException; +import org.owasp.dependencycheck.data.update.UpdateException; import org.owasp.dependencycheck.data.update.UpdateService; import org.owasp.dependencycheck.data.cpe.CpeMemoryIndex; import org.owasp.dependencycheck.data.cpe.IndexException; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java index 8059cc1fe..cd42c5385 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java @@ -19,7 +19,7 @@ package org.owasp.dependencycheck.data.nvdcve; import java.util.Properties; -import org.owasp.dependencycheck.update.UpdateException; +import org.owasp.dependencycheck.data.update.UpdateException; import org.owasp.dependencycheck.data.update.NvdCveInfo; /** diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java index e09b9a5af..94a78f934 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java @@ -18,8 +18,6 @@ */ package org.owasp.dependencycheck.data.update; -import org.owasp.dependencycheck.update.UpdateException; - /** * Defines a data source who's data is retrieved from the Internet. This data * can be downloaded and the local cache updated. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java similarity index 78% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java index 9a35da78d..fdc36f628 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java @@ -21,16 +21,15 @@ package org.owasp.dependencycheck.data.update; import java.net.MalformedURLException; import java.util.logging.Level; import java.util.logging.Logger; -import org.owasp.dependencycheck.update.UpdateException; import org.owasp.dependencycheck.data.nvdcve.DatabaseException; import org.owasp.dependencycheck.utils.DownloadFailedException; /** - * Class responsible for updating the CPE and NVDCVE data stores. + * Class responsible for updating the NVD CVE and CPE data stores. * * @author Jeremy Long (jeremy.long@owasp.org) */ -public class DatabaseUpdater implements CachedWebDataSource { +public class NvdCveUpdater implements CachedWebDataSource { /** *

Downloads the latest NVD CVE XML file from the web and imports it into @@ -49,20 +48,20 @@ public class DatabaseUpdater implements CachedWebDataSource { task.recreateTables(); } catch (DatabaseException ex) { final String msg = "Unable to update the database schema"; - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, msg); - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, null, ex); + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.FINE, null, ex); } } task.update(); } } catch (MalformedURLException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.WARNING, "NVD CVE properties files contain an invalid URL, unable to update the data to use the most current data."); - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, null, ex); + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.FINE, null, ex); } catch (DownloadFailedException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.WARNING, "Unable to download the NVD CVE data, unable to update the data to use the most current data."); - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, null, ex); + Logger.getLogger(NvdCveUpdater.class.getName()).log(Level.FINE, null, ex); } } // diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java index 01c7ff9b9..f0843d004 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.owasp.dependencycheck.update.UpdateException; import org.owasp.dependencycheck.data.nvdcve.CveDB; import org.owasp.dependencycheck.data.nvdcve.DatabaseException; import org.owasp.dependencycheck.dependency.VulnerableSoftware; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java index a4ace4118..bfcff1772 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java @@ -32,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import org.owasp.dependencycheck.update.UpdateException; import org.owasp.dependencycheck.data.nvdcve.CveDB; import org.owasp.dependencycheck.utils.DownloadFailedException; import org.owasp.dependencycheck.utils.Settings; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/update/UpdateException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java similarity index 97% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/update/UpdateException.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java index 7866717ad..8de616eab 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/update/UpdateException.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.update; +package org.owasp.dependencycheck.data.update; import java.io.IOException; diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource deleted file mode 100644 index c42a832ed..000000000 --- a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.CachedWebDataSource +++ /dev/null @@ -1 +0,0 @@ -org.owasp.dependencycheck.data.update.DatabaseUpdater \ No newline at end of file diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource new file mode 100644 index 000000000..4407069b5 --- /dev/null +++ b/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource @@ -0,0 +1 @@ +org.owasp.dependencycheck.data.update.NvdCveUpdater \ No newline at end of file diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java index 6cdf7ddef..07f0582ed 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java @@ -51,11 +51,11 @@ public class DatabaseUpdaterIntegrationTest { } /** - * Test of update method, of class DatabaseUpdater. + * Test of update method, of class NvdCveUpdater. */ @Test public void testUpdate() throws Exception { - DatabaseUpdater instance = new DatabaseUpdater(); + NvdCveUpdater instance = new NvdCveUpdater(); instance.update(); } } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java index 0fc4a8bfb..ce5d4f2d3 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; -import org.owasp.dependencycheck.update.UpdateException; import org.owasp.dependencycheck.utils.DownloadFailedException; /**