@@ -60,19 +60,24 @@ case class LintCommand(inputDir: File, skipWarnings: Boolean, linters: List[Lint
6060 val stubCommand = GenerateCommand (stubFile, stubFile)
6161 val (_, schemas) = splitValidations(validatedJsons.map(_.extractSelfDescribingSchema))
6262 val schemaVerValidation : Result = stubCommand.validateSchemaVersions(schemas)
63- // strip GenerateCommand related parts off & prepare LintCommand failure messages
64- val lintSchemaVerMessages : List [String ] = schemaVerValidation match {
65- case Warnings (lst) => lst.map(w => " FAILURE" + w.stripPrefix(" Warning"
66- case Errors (lst) => lst.map(e => " FAILURE" + e.stripPrefix(" Error" " Use --force to switch off schema version check."
67- case VersionSuccess (_) => List .empty[String ]
68- }
69- lintSchemaVerMessages.foreach(println)
7063
7164 val reports = jsons.map { file =>
7265 val report = file.map(check)
7366 flattenReport(report)
7467 }
75- reports.foldLeft(Total (0 , 0 , lintSchemaVerMessages.size))((acc, cur) => acc.add(cur)).exit()
68+
69+ // strip GenerateCommand related parts off & prepare LintCommand messages & create a Total per schema version check
70+ schemaVerValidation match {
71+ case Warnings (lst) =>
72+ lst.map(w => " WARNING" + w.stripPrefix(" Warning"
73+ reports.foldLeft(Total (0 , 0 , 0 , lst.size))((acc, cur) => acc.add(cur)).exit()
74+ case Errors (lst) =>
75+ lst.map(e => " FAILURE" +
76+ e.stripPrefix(" Error" " Use --force to switch off schema version check."
77+ reports.foldLeft(Total (0 , 0 , lst.size, 0 ))((acc, cur) => acc.add(cur)).exit()
78+ case VersionSuccess (_) =>
79+ reports.foldLeft(Total (0 , 0 , 0 , 0 ))((acc, cur) => acc.add(cur)).exit()
80+ }
7681 }
7782
7883 /**
@@ -111,14 +116,15 @@ object LintCommand {
111116 * @param successes number of successfully validated schemas
112117 * @param failedSchemas number of schemas with errors
113118 */
114- case class Total (successes : Int , failedSchemas : Int , totalFailures : Int ) {
119+ case class Total (successes : Int , failedSchemas : Int , totalFailures : Int , totalWarnings : Int ) {
115120 /**
116121 * Exit from app with error status if invalid schemas were found
117122 */
118123 def exit (): Unit = {
119124 println(s " TOTAL: $successes Schemas were successfully validated " )
120125 println(s " TOTAL: $failedSchemas invalid Schemas were encountered " )
121126 println(s " TOTAL: $totalFailures errors were encountered " )
127+ println(s " TOTAL: $totalWarnings warnings were encountered " )
122128
123129 if (failedSchemas + totalFailures > 0 ) sys.exit(1 )
124130 else sys.exit(0 )
0 commit comments