From b3d9ea3c47abbadcaf2b126fd1c2bcf71cd0d19a Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 7 Jul 2016 06:18:54 -0400 Subject: [PATCH] minor code reorg --- .../analyzer/AbstractSuppressionAnalyzer.java | 6 +++--- .../dependencycheck/analyzer/CpeSuppressionAnalyzer.java | 2 +- .../org/owasp/dependencycheck/analyzer/HintAnalyzer.java | 6 +++--- .../analyzer/VulnerabilitySuppressionAnalyzer.java | 2 +- .../org/owasp/dependencycheck/xml/hints/HintHandler.java | 2 +- .../org/owasp/dependencycheck/xml/hints/HintRule.java | 2 +- .../{ => xml}/suppression/PropertyType.java | 2 +- .../{ => xml}/suppression/SuppressionErrorHandler.java | 2 +- .../{ => xml}/suppression/SuppressionHandler.java | 2 +- .../{ => xml}/suppression/SuppressionParseException.java | 2 +- .../{ => xml}/suppression/SuppressionParser.java | 2 +- .../{ => xml}/suppression/SuppressionRule.java | 2 +- .../{ => xml}/suppression/package-info.java | 2 +- .../analyzer/AbstractSuppressionAnalyzerTest.java | 4 ++-- .../owasp/dependencycheck/xml/hints/HintHandlerTest.java | 8 ++++---- .../{ => xml}/suppression/PropertyTypeTest.java | 2 +- .../{ => xml}/suppression/SuppressionHandlerTest.java | 2 +- .../{ => xml}/suppression/SuppressionParserTest.java | 2 +- .../{ => xml}/suppression/SuppressionRuleTest.java | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/PropertyType.java (98%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionErrorHandler.java (98%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionHandler.java (99%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionParseException.java (97%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionParser.java (99%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionRule.java (99%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/{ => xml}/suppression/package-info.java (51%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{ => xml}/suppression/PropertyTypeTest.java (98%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionHandlerTest.java (98%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionParserTest.java (96%) rename dependency-check-core/src/test/java/org/owasp/dependencycheck/{ => xml}/suppression/SuppressionRuleTest.java (99%) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java index 812f70394..4bbfc087a 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java @@ -25,9 +25,9 @@ import java.net.URL; import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import org.owasp.dependencycheck.suppression.SuppressionParseException; -import org.owasp.dependencycheck.suppression.SuppressionParser; -import org.owasp.dependencycheck.suppression.SuppressionRule; +import org.owasp.dependencycheck.xml.suppression.SuppressionParseException; +import org.owasp.dependencycheck.xml.suppression.SuppressionParser; +import org.owasp.dependencycheck.xml.suppression.SuppressionRule; import org.owasp.dependencycheck.utils.DownloadFailedException; import org.owasp.dependencycheck.utils.Downloader; import org.owasp.dependencycheck.utils.FileUtils; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java index a256c46f1..537fa731c 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java @@ -20,7 +20,7 @@ package org.owasp.dependencycheck.analyzer; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.dependency.Dependency; -import org.owasp.dependencycheck.suppression.SuppressionRule; +import org.owasp.dependencycheck.xml.suppression.SuppressionRule; /** * The suppression analyzer processes an externally defined XML document that complies with the suppressions.xsd schema. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java index 7279d11b8..3d32dc819 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java @@ -32,9 +32,9 @@ import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; -import org.owasp.dependencycheck.suppression.PropertyType; -import org.owasp.dependencycheck.suppression.SuppressionParseException; -import org.owasp.dependencycheck.suppression.SuppressionParser; +import org.owasp.dependencycheck.xml.suppression.PropertyType; +import org.owasp.dependencycheck.xml.suppression.SuppressionParseException; +import org.owasp.dependencycheck.xml.suppression.SuppressionParser; import org.owasp.dependencycheck.utils.DownloadFailedException; import org.owasp.dependencycheck.utils.Downloader; import org.owasp.dependencycheck.utils.FileUtils; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java index 11dc9c825..4ceac47ce 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java @@ -20,7 +20,7 @@ package org.owasp.dependencycheck.analyzer; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.dependency.Dependency; -import org.owasp.dependencycheck.suppression.SuppressionRule; +import org.owasp.dependencycheck.xml.suppression.SuppressionRule; /** * The suppression analyzer processes an externally defined XML document that complies with the suppressions.xsd schema. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java index bd1477e63..c5bd0f7b3 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java @@ -20,7 +20,7 @@ package org.owasp.dependencycheck.xml.hints; import java.util.ArrayList; import java.util.List; import org.owasp.dependencycheck.dependency.Confidence; -import org.owasp.dependencycheck.suppression.PropertyType; +import org.owasp.dependencycheck.xml.suppression.PropertyType; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java index 0ab10091d..ec85d98f2 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Evidence; -import org.owasp.dependencycheck.suppression.PropertyType; +import org.owasp.dependencycheck.xml.suppression.PropertyType; /** * A collection of product and vendor evidence to match; if any evidence is diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/PropertyType.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java similarity index 98% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/PropertyType.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java index 4ecd66323..772f338fb 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/PropertyType.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.util.regex.Pattern; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java similarity index 98% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java index 5d8b8733a..bacbcb5a0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java similarity index 99% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java index ddb414e6f..b07909653 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionHandler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.util.ArrayList; import java.util.List; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParseException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java similarity index 97% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParseException.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java index 6c8e938de..d0d5c87df 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParseException.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.io.IOException; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java similarity index 99% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java index 945388a7a..6b4b7e6e4 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.io.File; import java.io.FileInputStream; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java similarity index 99% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java index 1a2353fdf..80e78bdd2 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.util.ArrayList; import java.util.Iterator; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/package-info.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java similarity index 51% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/package-info.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java index f8974043d..0abc2af40 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/package-info.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java @@ -1,4 +1,4 @@ /** * Contains classes used to suppress findings. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java index 27527b2c2..866a99a53 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java @@ -23,8 +23,8 @@ import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Dependency; -import org.owasp.dependencycheck.suppression.SuppressionParseException; -import org.owasp.dependencycheck.suppression.SuppressionRule; +import org.owasp.dependencycheck.xml.suppression.SuppressionParseException; +import org.owasp.dependencycheck.xml.suppression.SuppressionRule; import org.owasp.dependencycheck.utils.Settings; import org.slf4j.LoggerFactory; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java index dd71ebf4b..0b055fb1d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java @@ -32,10 +32,10 @@ import javax.xml.parsers.SAXParserFactory; import org.junit.Test; import static org.junit.Assert.*; import org.owasp.dependencycheck.BaseTest; -import org.owasp.dependencycheck.suppression.SuppressionErrorHandler; -import org.owasp.dependencycheck.suppression.SuppressionHandler; -import org.owasp.dependencycheck.suppression.SuppressionParser; -import org.owasp.dependencycheck.suppression.SuppressionRule; +import org.owasp.dependencycheck.xml.suppression.SuppressionErrorHandler; +import org.owasp.dependencycheck.xml.suppression.SuppressionHandler; +import org.owasp.dependencycheck.xml.suppression.SuppressionParser; +import org.owasp.dependencycheck.xml.suppression.SuppressionRule; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java index 2502ee4fd..9ad49e0f1 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/PropertyTypeTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java index 45fd9240b..9517a1a7f 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionHandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.io.File; import java.io.FileInputStream; diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java similarity index 96% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java index d911c9cb2..d09ac9ee9 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionParserTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.io.File; import java.util.List; 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/xml/suppression/SuppressionRuleTest.java similarity index 99% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java index 0a73d13a1..56982887a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/suppression/SuppressionRuleTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java @@ -15,7 +15,7 @@ * * Copyright (c) 2013 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.suppression; +package org.owasp.dependencycheck.xml.suppression; import java.io.File; import java.util.ArrayList;