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

minor cleanup of code/comments

Browse Source
This commit is contained in:
Jeremy Long
2016-07-04 07:07:07 -04:00
parent 84682d07c6
commit 519b82c620
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java
View File

@@ -61,14 +61,22 @@ public class SuppressionParser {
* http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html * http://docs.oracle.com/javase/tutorial/jaxp/sax/validation.html
*/ */
public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; public static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
/**
* The suppression schema file location.
*/
private static final String SUPPRESSION_SCHEMA = "schema/dependency-suppression.1.1.xsd";
/**
* The old suppression schema file location.
*/
private static final String OLD_SUPPRESSION_SCHEMA = "schema/suppression.xsd";
/** /**
* Parses the given xml file and returns a list of the suppression rules * Parses the given XML file and returns a list of the suppression rules
* contained. * contained.
* *
* @param file an xml file containing suppression rules * @param file an XML file containing suppression rules
* @return a list of suppression rules * @return a list of suppression rules
* @throws SuppressionParseException thrown if the xml file cannot be parsed * @throws SuppressionParseException thrown if the XML file cannot be parsed
*/ */
public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException { public List<SuppressionRule> parseSuppressionRules(File file) throws SuppressionParseException {
FileInputStream fis = null; FileInputStream fis = null;
@@ -104,17 +112,17 @@ public class SuppressionParser {
} }
/** /**
* Parses the given xml stream and returns a list of the suppression rules * Parses the given XML stream and returns a list of the suppression rules
* contained. * contained.
* *
* @param inputStream an InputStream containing suppression rues * @param inputStream an InputStream containing suppression rules
* @return a list of suppression rules * @return a list of suppression rules
* @throws SuppressionParseException thrown if the xml cannot be parsed * @throws SuppressionParseException thrown if the XML cannot be parsed
* @throws SAXException thrown if the xml cannot be parsed * @throws SAXException thrown if the XML cannot be parsed
*/ */
public List<SuppressionRule> parseSuppressionRules(InputStream inputStream) throws SuppressionParseException, SAXException { public List<SuppressionRule> parseSuppressionRules(InputStream inputStream) throws SuppressionParseException, SAXException {
try { try {
final InputStream schemaStream = this.getClass().getClassLoader().getResourceAsStream("schema/dependency-suppression.1.1.xsd"); final InputStream schemaStream = this.getClass().getClassLoader().getResourceAsStream(SUPPRESSION_SCHEMA);
final SuppressionHandler handler = new SuppressionHandler(); final SuppressionHandler handler = new SuppressionHandler();
final SAXParserFactory factory = SAXParserFactory.newInstance(); final SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
@@ -153,16 +161,16 @@ public class SuppressionParser {
} }
/** /**
* Parses the given xml stream and returns a list of the suppression rules * Parses the given XML stream and returns a list of the suppression rules
* contained. * contained.
* *
* @param inputStream an InputStream containing suppression rues * @param inputStream an InputStream containing suppression rues
* @return a list of suppression rules * @return a list of suppression rules
* @throws SuppressionParseException if the xml cannot be parsed * @throws SuppressionParseException if the XML cannot be parsed
*/ */
private List<SuppressionRule> parseOldSuppressionRules(InputStream inputStream) throws SuppressionParseException { private List<SuppressionRule> parseOldSuppressionRules(InputStream inputStream) throws SuppressionParseException {
try { try {
final InputStream schemaStream = this.getClass().getClassLoader().getResourceAsStream("schema/suppression.xsd"); final InputStream schemaStream = this.getClass().getClassLoader().getResourceAsStream(OLD_SUPPRESSION_SCHEMA);
final SuppressionHandler handler = new SuppressionHandler(); final SuppressionHandler handler = new SuppressionHandler();
final SAXParserFactory factory = SAXParserFactory.newInstance(); final SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware(true); factory.setNamespaceAware(true);
@@ -176,7 +184,6 @@ public class SuppressionParser {
final Reader reader = new InputStreamReader(inputStream, "UTF-8"); final Reader reader = new InputStreamReader(inputStream, "UTF-8");
final InputSource in = new InputSource(reader); final InputSource in = new InputSource(reader);
//in.setEncoding("UTF-8");
xmlReader.parse(in); xmlReader.parse(in);

8
dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java
View File

@@ -25,11 +25,7 @@ import java.io.Reader;
import java.util.List; import java.util.List;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.BaseTest;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
@@ -48,10 +44,7 @@ public class SuppressionHandlerTest extends BaseTest {
*/ */
@Test @Test
public void testHandler() throws Exception { public void testHandler() throws Exception {
//File file = new File(this.getClass().getClassLoader().getResource("suppressions.xml").getPath());
File file = BaseTest.getResourceAsFile(this, "suppressions.xml"); File file = BaseTest.getResourceAsFile(this, "suppressions.xml");
//File schema = new File(this.getClass().getClassLoader().getResource("schema/suppression.xsd").getPath());
File schema = BaseTest.getResourceAsFile(this, "schema/suppression.xsd"); File schema = BaseTest.getResourceAsFile(this, "schema/suppression.xsd");
SuppressionHandler handler = new SuppressionHandler(); SuppressionHandler handler = new SuppressionHandler();
@@ -81,6 +74,5 @@ public class SuppressionHandlerTest extends BaseTest {
} }
} }
assertTrue(baseCount > 0); assertTrue(baseCount > 0);
} }
} }