Merge pull request #44 from iantmoore/no-glossary-no-breakage

prevent the reportbuilder failing if no glossary info
Substeps · Mar 2, 2017 · c4c697a · c4c697a
2 parents 07e7518 + 29732ca
commit c4c697a
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/core/src/main/scala/org/substeps/report/ReportBuilder.scala b/core/src/main/scala/org/substeps/report/ReportBuilder.scala
@@ -92,17 +92,22 @@ class ReportBuilder extends IReportBuilder with ReportFrameTemplate with UsageTr
   def buildGlossaryData(sourceJsonFile : File) = {
     implicit val formats = Serialization.formats(NoTypeHints)
 
-    val data = read[List[StepImplDesc]](sourceJsonFile)
-
     val glossaryElements =
-      data.map(sid => sid.expressions.map(sd => {
 
-        val escapedExpression =
-          sd.expression.replaceAll("\\$$", "").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
+      if (sourceJsonFile.exists()) {
+        val data = read[List[StepImplDesc]](sourceJsonFile)
+
+        data.map(sid => sid.expressions.map(sd => {
 
-        GlossaryElement(sd.section, escapedExpression, sid.className, sd.regex, sd.example, sd.description, sd.parameterNames, sd.parameterClassNames)
-      })).flatten
+          val escapedExpression =
+            sd.expression.replaceAll("\\$$", "").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
 
+          GlossaryElement(sd.section, escapedExpression, sid.className, sd.regex, sd.example, sd.description, sd.parameterNames, sd.parameterClassNames)
+        })).flatten
+      }
+      else {
+        List()
+      }
     glossaryElements
   }