Redesign reports (#53)

Author: Adven27

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/Utils.kt

@@ -10,8 +10,6 @@ import mu.KotlinLogging
 import nu.xom.Builder
 import org.concordion.api.Element
 import org.concordion.api.Evaluator
-import org.w3c.dom.Document
-import org.xml.sax.InputSource
 import java.io.StringReader
 import java.time.Duration
 import java.time.LocalDate
@@ -24,27 +22,10 @@ import java.time.format.DateTimeParseException
 import java.time.format.ResolverStyle
 import java.util.Date
 import java.util.Random
-import javax.xml.parsers.DocumentBuilderFactory
 
 fun String.toHtml() = parseTemplate(this)
 fun parseTemplate(tmpl: String) = Html(Element(Builder().build(StringReader(tmpl)).rootElement).deepClone())
 
-fun getDomElement(xml: String): Document? {
-    var doc: Document? = null
-    val dbf = DocumentBuilderFactory.newInstance()
-    dbf.isCoalescing = true
-    dbf.isNamespaceAware = true
-    try {
-        val db = dbf.newDocumentBuilder()
-        val `is` = InputSource()
-        `is`.characterStream = StringReader(xml)
-        doc = db.parse(`is`)
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return doc
-}
-
 private val DEFAULT_ZONED_DATETIME_FORMAT =
     DateTimeFormatter.ISO_OFFSET_DATE_TIME.withResolverStyle(ResolverStyle.SMART)
 private val DEFAULT_LOCAL_DATETIME_FORMAT = DateTimeFormatter.ISO_DATE_TIME.withResolverStyle(ResolverStyle.SMART)
@@ -183,9 +164,4 @@ fun List<String>.sameSizeWith(values: List<Any?>): List<String> = if (values.siz
     )
 } else this
 
-fun <R> memoized(fn: (Any) -> R): (Any) -> R {
-    val cache: MutableMap<Any, R> = HashMap()
-    return { cache.getOrPut(it) { fn(it) } }
-}
-
-fun String.escapeHtml(): String = StringEscapeUtils.escapeHtml4(this)
+fun String.escapeHtml(): String = StringEscapeUtils.escapeHtml4(this)

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/ExamVerifyCommand.kt

@@ -84,7 +84,8 @@ open class ExamVerifyCommand(
 }
 
 abstract class ExamSetUpCommand<T>(
-    private val parser: CommandParser<T>, private val listener: SetUpListener<T>
+    private val parser: CommandParser<T>,
+    private val listener: SetUpListener<T>
 ) : AbstractCommand() {
     protected fun setUpCompleted(element: Element, target: T) = listener.setUpCompleted(SetUpEvent(element, target))
 

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/builder/DataSetExecutor.kt

@@ -138,8 +138,9 @@ class DataSetExecutor(private val dbTester: DbTester) {
         if (!dataSet.startsWith("/")) {
             dataSet = "/$dataSet"
         }
-        return javaClass.getResourceAsStream(dataSet) ?: javaClass.getResourceAsStream("/datasets$dataSet")
-        ?: throw DatasetNotFound(dataSet.substring(1))
+        return javaClass.getResourceAsStream(dataSet)
+            ?: javaClass.getResourceAsStream("/datasets$dataSet")
+            ?: throw DatasetNotFound(dataSet.substring(1))
     }
 
     class DatasetNotFound(name: String) :

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/check/CheckCommand.kt

@@ -20,6 +20,7 @@ import org.concordion.api.ResultRecorder
 import org.dbunit.dataset.ITable
 import org.dbunit.util.QualifiedTableName
 
+@Suppress("LongParameterList")
 class CheckCommand(
     override val name: String,
     val dbTester: DbTester,

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/check/CheckParsers.kt

@@ -67,7 +67,7 @@ class MdCheckParser : CheckParser() {
     }
 }
 
-class HtmlCheckParser : CheckParser() {
+open class HtmlCheckParser : CheckParser() {
     private val remarks = HashMap<String, Int>()
     private val colParser = ColParser()
 

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/check/CheckRenderers.kt

@@ -30,6 +30,7 @@ class HtmlResultRenderer(printer: ValuePrinter) : BaseResultRenderer(printer) {
     override fun root(event: AbstractElementEvent): Element = event.element
 }
 
+@Suppress("TooManyFunctions")
 abstract class BaseResultRenderer(private val printer: ValuePrinter) : SuitableResultRenderer<Expected, ITable>() {
     abstract fun root(event: AbstractElementEvent): Element
 

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/set/SetParsers.kt

@@ -81,7 +81,6 @@ class ShowCommand(
                 }
             }
         }
-
     }
 
     private fun save(saveToResources: String?, dataSet: IDataSet, it: ByteArrayOutputStream) {

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/show/ShowCommand.kt

@@ -30,6 +30,8 @@ import java.io.File
 class FilesCheckCommand(name: String?, tag: String?, filesLoader: FilesLoader) : BaseCommand(name, tag) {
     private val listeners = Announcer.to(AssertEqualsListener::class.java)
     private val filesLoader: FilesLoader
+
+    @Suppress("LongMethod", "NestedBlockDepth", "SpreadOperator")
     override fun verify(
         commandCall: CommandCall,
         evaluator: Evaluator,
@@ -132,8 +134,8 @@ class FilesCheckCommand(name: String?, tag: String?, filesLoader: FilesLoader) :
                     element.appendText(prettyActual)
                     xmlEquals(resultRecorder, element)
                 }
-        } catch (e: Exception) {
-            LOG.debug("Got exception on xml checking: {}", e.message)
+        } catch (ignore: Exception) {
+            LOG.debug("Got exception on xml checking: {}", ignore.message)
             xmlDoesNotEqual(resultRecorder, element, prettyActual, expected)
         }
     }