Updated according to fortify-ssc-parser-util refactoring

Author: rsenden

build.gradle

@@ -23,13 +23,13 @@ if (!project.hasProperty('release')) {
 }
 
 repositories {
+	mavenLocal()
     // repository with fortify artifacts
     maven { url "http://dl.bintray.com/fortify/maven-public" }
     // repository with fortify-ps releases
     maven { url "https://dl.bintray.com/fortify-ps/maven" }
     // repository with fortify-ps snapshots
     maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" }
-    mavenLocal()
     mavenCentral()
 }
 
@@ -38,6 +38,11 @@ configurations {
     compile.extendsFrom (compileExport)
 }
 
+configurations.all {
+    // Don't cache modules that may change (i.e. snapshots)
+	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 test {
     useJUnitPlatform()
 }
@@ -47,7 +52,7 @@ dependencies {
     compile 'com.fortify.plugin:plugin-api:1.0.1'
     compile 'org.slf4j:slf4j-api:1.7.21'
 
-    compileExport(group: 'com.fortify.ssc.parser.util', name: 'fortify-ssc-parser-util', version:'1.0.1-SNAPSHOT') { transitive = true }
+    compileExport(group: 'com.fortify.ssc.parser.util', name: 'fortify-ssc-parser-util', version:'1.1.0-SNAPSHOT', changing: true) { transitive = true }
 
     //testImplementation 'org.junit.platform:junit-jupiter-api:5.3.1'
 

src/main/java/com/fortify/ssc/parser/owasp/dependencycheck/parser/ScanParser.java

@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 
-import static com.fortify.util.json.AbstractStreamingJsonParser.countArrayEntries;
-
 import com.fortify.plugin.api.ScanBuilder;
 import com.fortify.plugin.api.ScanData;
 import com.fortify.plugin.api.ScanParsingException;
@@ -25,7 +23,7 @@ public final void parse() throws ScanParsingException, IOException {
 			.handler("/projectInfo/reportDate", jp -> scanBuilder.setScanDate(DateConverter.getInstance().convert(jp.getValueAsString())))
 			.handler("/projectInfo/name", jp -> scanBuilder.setBuildId(jp.getValueAsString()))
 			.handler("/projectInfo/version", jp -> scanBuilder.setScanLabel(jp.getValueAsString()))
-			.handler("/dependencies", jp -> scanBuilder.setNumFiles(countArrayEntries(jp)))
+			.handler("/dependencies", jp -> scanBuilder.setNumFiles(jp.countArrayEntries()))
 			.parse(scanData);
 		scanBuilder.completeScan();
 	}

src/main/java/com/fortify/ssc/parser/owasp/dependencycheck/parser/VulnerabilitiesParser.java

@@ -18,7 +18,7 @@
 import com.fortify.ssc.parser.owasp.dependencycheck.domain.Dependency;
 import com.fortify.ssc.parser.owasp.dependencycheck.domain.Vulnerability;
 import com.fortify.ssc.parser.owasp.dependencycheck.parser.util.Constants;
-import com.fortify.util.json.handler.JsonArrayMapperHandler;
+import com.fortify.util.json.ExtendedJsonParser;
 import com.fortify.util.ssc.parser.ScanDataStreamingJsonParser;
 
 public class VulnerabilitiesParser {
@@ -38,10 +38,14 @@ public VulnerabilitiesParser(final ScanData scanData, final VulnerabilityHandler
 	 */
 	public final void parse() throws ScanParsingException, IOException {
 		new ScanDataStreamingJsonParser()
-			.handler("/dependencies", new JsonArrayMapperHandler<>(dependency->handleDependency(dependency), Dependency.class))
+			.handler("/dependencies/*", this::handleDependency)
 			.parse(scanData);
 	}
 
+	private final void handleDependency(ExtendedJsonParser jp) throws IOException {
+		handleDependency(jp.readValueAs(Dependency.class));
+	}
+	
     private final void handleDependency(Dependency dependency) {
 		Vulnerability[] vulnerabilities = dependency.getVulnerabilities();
 		if ( vulnerabilities!=null && vulnerabilities.length>0 ) {