ErrorCodeDocumentationGenerator uses multiple prefixes for scanning c…

…lasspaths * Removed ProtoDeserializationErrors (not needed at the moment) CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Nov 2, 2021 · 26653d4 · 26653d4
1 parent 55d35e5
commit 26653d4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 67 deletions.
diff --git a/ledger/error/src/main/scala/com/daml/error/definitions/ErrorGroups.scala b/ledger/error/src/main/scala/com/daml/error/definitions/ErrorGroups.scala
@@ -9,8 +9,6 @@ object ErrorGroups {
 
   private implicit val errorClass: ErrorClass = ErrorClass.root()
 
-  abstract class ProtoDeserializationErrorGroup extends ErrorGroup
-
   object ParticipantErrorGroup extends ErrorGroup() {
     abstract class IndexErrorGroup extends ErrorGroup() {
       abstract class DatabaseErrorGroup extends ErrorGroup()

diff --git a/ledger/error/src/main/scala/com/daml/error/definitions/ProtoDeserializationError.scala b/ledger/error/src/main/scala/com/daml/error/definitions/ProtoDeserializationError.scala
diff --git a/ledger/error/src/main/scala/com/daml/error/generator/ErrorCodeDocumentationGenerator.scala b/ledger/error/src/main/scala/com/daml/error/generator/ErrorCodeDocumentationGenerator.scala
@@ -23,7 +23,7 @@ import scala.jdk.CollectionConverters._
   *
   * @param prefix The classpath prefix that should be scanned for finding subtypes of [[ErrorCode]].
   */
-case class ErrorCodeDocumentationGenerator(prefix: String = "com.daml") {
+class ErrorCodeDocumentationGenerator(prefixes: Array[String] = Array("com.daml")) {
 
   def getDocItems: Seq[DocItem] = {
     val errorCodes = getErrorCodeInstances
@@ -40,7 +40,7 @@ case class ErrorCodeDocumentationGenerator(prefix: String = "com.daml") {
   }
 
   private def getErrorCodeInstances: Seq[ErrorCode] =
-    new Reflections(prefix)
+    new Reflections(prefixes)
       .getSubTypesOf(classOf[ErrorCode])
       .asScala
       .view

diff --git a/ledger/error/src/main/scala/com/daml/error/generator/Main.scala b/ledger/error/src/main/scala/com/daml/error/generator/Main.scala
@@ -39,7 +39,7 @@ object Main {
     Encoder.forProduct1("errorCodes")(i => (i.errorCodes))
 
   def main(args: Array[String]): Unit = {
-    val errorCodes = ErrorCodeDocumentationGenerator().getDocItems
+    val errorCodes = new ErrorCodeDocumentationGenerator().getDocItems
     val outputFile = Paths.get(args(0))
     val output = Output(errorCodes)
     val outputText: String = output.asJson.spaces2

diff --git a/...r/src/test/suite/scala/com/daml/error/generator/ErrorCodeDocumentationGeneratorSpec.scala b/...r/src/test/suite/scala/com/daml/error/generator/ErrorCodeDocumentationGeneratorSpec.scala
@@ -16,7 +16,9 @@ class ErrorCodeDocumentationGeneratorSpec extends AnyFlatSpec with Matchers {
   private val className = ErrorCodeDocumentationGenerator.getClass.getSimpleName
 
   // Scan errors from the utils test package
-  private val generator = ErrorCodeDocumentationGenerator("com.daml.error.utils.testpackage")
+  private val generator = new ErrorCodeDocumentationGenerator(
+    Array("com.daml.error.utils.testpackage")
+  )
 
   s"$className.getDocItems" should "return the correct doc items from the error classes" in {
     val actualDocItems = generator.getDocItems