Tolerate but skip old dbb.scannerMapping configurations (#385)

dennis-behm · web-flow · commit e9c5ef3fb45d · 2023-07-12T10:47:20.000+02:00
* Tolerate but skip old dbb.scannerMapping configurations 
Signed-off-by: Dennis Behm &lt;dennis.behm@de.ibm.com&gt;
diff --git a/utilities/DependencyScannerUtilities.groovy b/utilities/DependencyScannerUtilities.groovy
@@ -146,8 +146,11 @@ def parseConfigStringToMap(String configString) {
 		}
 	}
 	
-	// validate existance of scannerClass definition
-	assert scannerConfigMap.scannerClass != null
+	if (scannerConfigMap.scannerClass == null) {
+		println "*! The provided scanner mapping configuration ($configString) is not formed correctly and skipped."
+		println "*! Sample syntax: 'dbb.scannerMapping = \"scannerClass\":\"DependencyScanner\", \"languageHint\":\"COB\" :: cbl,cpy,cob'"
+		return null
+	}
 	
 	return scannerConfigMap
 }

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,11 @@ def parseConfigStringToMap(String configString) {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- // validate existance of scannerClass definition`
`150`		`- assert scannerConfigMap.scannerClass != null`
	`149`	`+ if (scannerConfigMap.scannerClass == null) {`
	`150`	`+ println "*! The provided scanner mapping configuration ($configString) is not formed correctly and skipped."`
	`151`	`+ println "*! Sample syntax: 'dbb.scannerMapping = \"scannerClass\":\"DependencyScanner\", \"languageHint\":\"COB\" :: cbl,cpy,cob'"`
	`152`	`+ return null`
	`153`	`+ }`
`151`	`154`
`152`	`155`	`return scannerConfigMap`
`153`	`156`	`}`