From 48a6eb1f86d58581c09999a198da64e9b70a1974 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sat, 12 Sep 2015 15:35:56 +0200 Subject: [PATCH] Prefer interfaces over concerete classes. Did not change return type for public methods as this might potentially cause problems/need for changes for external users --- .../org/owasp/dependencycheck/Engine.java | 3 +- .../data/central/CentralSearch.java | 2 +- .../owasp/dependencycheck/data/cwe/CweDB.java | 7 +++-- .../data/nvdcve/CveDBIntegrationTest.java | 3 +- .../suppression/SuppressionRuleTest.java | 31 +++---------------- 5 files changed, 13 insertions(+), 33 deletions(-) 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 b6e170a7d..d6bf1d839 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 @@ -42,6 +42,7 @@ import java.util.EnumMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -59,7 +60,7 @@ public class Engine implements FileFilter { /** * A Map of analyzers grouped by Analysis phase. */ - private EnumMap> analyzers = new EnumMap>(AnalysisPhase.class); + private Map> analyzers = new EnumMap>(AnalysisPhase.class); /** * A Map of analyzers grouped by Analysis phase. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java index 53bdd37d5..a5f484c43 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java @@ -116,7 +116,7 @@ public class CentralSearch { if ("0".equals(numFound)) { missing = true; } else { - final ArrayList result = new ArrayList(); + final List result = new ArrayList(); final NodeList docs = (NodeList) xpath.evaluate("/response/result/doc", doc, XPathConstants.NODESET); for (int i = 0; i < docs.getLength(); i++) { final String g = xpath.evaluate("./str[@name='g']", docs.item(i)); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java index b17e3ca7d..30c50ab78 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.util.HashMap; +import java.util.Map; /** * @@ -45,21 +46,21 @@ public final class CweDB { /** * A HashMap of the CWE data. */ - private static final HashMap CWE = loadData(); + private static final Map CWE = loadData(); /** * Loads a HashMap containing the CWE data from a resource found in the jar. * * @return a HashMap of CWE data */ - private static HashMap loadData() { + private static Map loadData() { ObjectInputStream oin = null; try { final String filePath = "data/cwe.hashmap.serialized"; final InputStream input = CweDB.class.getClassLoader().getResourceAsStream(filePath); oin = new ObjectInputStream(input); @SuppressWarnings("unchecked") - final HashMap ret = (HashMap) oin.readObject(); + final Map ret = (HashMap) oin.readObject(); return ret; } catch (ClassNotFoundException ex) { LOGGER.warn("Unable to load CWE data. This should not be an issue."); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java index f0d2d5f93..72c3047c3 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java @@ -19,6 +19,7 @@ package org.owasp.dependencycheck.data.nvdcve; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.junit.Assert; @@ -121,7 +122,7 @@ public class CveDBIntegrationTest extends BaseDBTestCase { @Test public void testGetMatchingSoftware() throws Exception { CveDB instance = null; - HashMap versions = new HashMap(); + Map versions = new HashMap(); DependencyVersion identifiedVersion = new DependencyVersion("1.0.1o"); versions.put("cpe:/a:openssl:openssl:1.0.1e", Boolean.FALSE); try { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java index 4e293d7d6..f6e874304 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java @@ -20,13 +20,9 @@ package org.owasp.dependencycheck.suppression; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.junit.After; -import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.dependency.Dependency; @@ -40,25 +36,6 @@ import org.owasp.dependencycheck.dependency.Vulnerability; */ public class SuppressionRuleTest { - public SuppressionRuleTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - // /** * Test of FilePath property, of class SuppressionRule. @@ -91,7 +68,7 @@ public class SuppressionRuleTest { @Test public void testCpe() { SuppressionRule instance = new SuppressionRule(); - ArrayList cpe = new ArrayList(); + List cpe = new ArrayList(); instance.setCpe(cpe); assertFalse(instance.hasCpe()); PropertyType pt = new PropertyType(); @@ -109,7 +86,7 @@ public class SuppressionRuleTest { @Test public void testGetCvssBelow() { SuppressionRule instance = new SuppressionRule(); - ArrayList cvss = new ArrayList(); + List cvss = new ArrayList(); instance.setCvssBelow(cvss); assertFalse(instance.hasCvssBelow()); instance.addCvssBelow(0.7f); @@ -124,7 +101,7 @@ public class SuppressionRuleTest { @Test public void testCwe() { SuppressionRule instance = new SuppressionRule(); - ArrayList cwe = new ArrayList(); + List cwe = new ArrayList(); instance.setCwe(cwe); assertFalse(instance.hasCwe()); instance.addCwe("2"); @@ -139,7 +116,7 @@ public class SuppressionRuleTest { @Test public void testCve() { SuppressionRule instance = new SuppressionRule(); - ArrayList cve = new ArrayList(); + List cve = new ArrayList(); instance.setCve(cve); assertFalse(instance.hasCve()); instance.addCve("CVE-2013-1337");