bump generator and re-run it. Standardises ukcore comment formatting (#…

…192)

Makefile

@@ -3,7 +3,7 @@ BENCH_NUMBER=$(shell echo ${CIRCLE_JOB} | sed 's/benchmark//')
 CORE_MODULES=core hl7
 US_MODULES=usbase uscore
 ALL_MODULES=$(CORE_MODULES) $(US_MODULES) ukcore
-HYDRANT_VERSION=0.10.5
+HYDRANT_VERSION=1.2.0
 HYDRA_DOCKER=-e LIT_LOG_ON_BAD_PROFILE=false -e LIT_BUILDTIME_CLASSGRAPH=lit-graph -e LIT_CREATE_PHANTOM_VALUES=false $(HYDRANT_IMAGE):$(HYDRANT_VERSION)
 
 generated-compile:

build.sbt

@@ -26,7 +26,7 @@ val V = new {
   val izumiReflect           = "2.2.0"
   val jsonassert             = "1.5.1"
   val jUnit                  = "5.9.1"
-  val litVersionForGenerator = "0.14.13"
+  val litVersionForGenerator = "0.14.17"
   val logback                = "1.4.3"
   val lombok                 = "1.18.24"
   val scalaMeterVersion      = "0.22"

core/src/test/scala/com/babylonhealth/lit/core/ChoiceTest.scala

@@ -10,18 +10,18 @@ import com.babylonhealth.lit.core.model.Extension
 class ChoiceTest extends AnyFreeSpec with Matchers {
   "can extract the value from a choice if it matches" in {
     val code: Extension.ValueChoice = choice("code": Code)
-    val extractedCode = code.as[Code]
+    val extractedCode               = code.as[Code]
     extractedCode shouldEqual Some("code": Code)
     val string: Extension.ValueChoice = choice("string")
-    val extractedString = string.as[String]
+    val extractedString               = string.as[String]
     extractedString shouldEqual Some("string")
   }
   "doesn't extract the value from a choice if doesn't match" in {
     val code: Extension.ValueChoice = choice("code": Code)
-    val unextractedCode = code.as[String]
+    val unextractedCode             = code.as[String]
     unextractedCode shouldEqual None
     val string: Extension.ValueChoice = choice("string")
-    val unextractedString = string.as[Code]
+    val unextractedString             = string.as[Code]
     unextractedString shouldEqual None
   }
 }

ukcore/src/main/scala/com/babylonhealth/lit/ukcore/model/UKCore_AllergyIntolerance.scala

@@ -261,81 +261,81 @@ object UKCore_AllergyIntolerance extends CompanionFor[UKCore_AllergyIntolerance]
   * @constructor
   *   Inherits all params from parent. Requires the following fields which were optional in the parent: code.
   * @param id
-  *   \- The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
+  *   - The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.
   * @param meta
-  *   \- The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might
-  *   not always be associated with version changes to the resource.
+  *   - The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might
+  *     not always be associated with version changes to the resource.
   * @param text
-  *   \- A human-readable narrative that contains a summary of the resource and can be used to represent the content of the
-  *   resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to
-  *   make it "clinically safe" for a human to just read the narrative. Resource definitions may define what content should be
-  *   represented in the narrative to ensure clinical safety.
+  *   - A human-readable narrative that contains a summary of the resource and can be used to represent the content of the
+  *     resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail
+  *     to make it "clinically safe" for a human to just read the narrative. Resource definitions may define what content should
+  *     be represented in the narrative to ensure clinical safety.
   * @param `type`
-  *   \- Identification of the underlying physiological mechanism for the reaction risk.
+  *   - Identification of the underlying physiological mechanism for the reaction risk.
   * @param code
-  *   \- Code for an allergy or intolerance statement (either a positive or a negated/excluded statement). This may be a code for
-  *   a substance or pharmaceutical product that is considered to be responsible for the adverse reaction risk (e.g., "Latex"), an
-  *   allergy or intolerance condition (e.g., "Latex allergy"), or a negated/excluded code for a specific substance or class
-  *   (e.g., "No latex allergy") or a general or categorical negated statement (e.g., "No known allergy", "No known drug
-  *   allergies"). Note: the substance for a specific reaction may be different from the substance identified as the cause of the
-  *   risk, but it must be consistent with it. For instance, it may be a more specific substance (e.g. a brand medication) or a
-  *   composite product that includes the identified substance. It must be clinically safe to only process the 'code' and ignore
-  *   the 'reaction.substance'. If a receiving system is unable to confirm that AllergyIntolerance.reaction.substance falls within
-  *   the semantic scope of AllergyIntolerance.code, then the receiving system should ignore
-  *   AllergyIntolerance.reaction.substance.
+  *   - Code for an allergy or intolerance statement (either a positive or a negated/excluded statement). This may be a code for a
+  *     substance or pharmaceutical product that is considered to be responsible for the adverse reaction risk (e.g., "Latex"), an
+  *     allergy or intolerance condition (e.g., "Latex allergy"), or a negated/excluded code for a specific substance or class
+  *     (e.g., "No latex allergy") or a general or categorical negated statement (e.g., "No known allergy", "No known drug
+  *     allergies"). Note: the substance for a specific reaction may be different from the substance identified as the cause of
+  *     the risk, but it must be consistent with it. For instance, it may be a more specific substance (e.g. a brand medication)
+  *     or a composite product that includes the identified substance. It must be clinically safe to only process the 'code' and
+  *     ignore the 'reaction.substance'. If a receiving system is unable to confirm that AllergyIntolerance.reaction.substance
+  *     falls within the semantic scope of AllergyIntolerance.code, then the receiving system should ignore
+  *     AllergyIntolerance.reaction.substance.
   * @param patient
-  *   \- The patient who has the allergy or intolerance.
+  *   - The patient who has the allergy or intolerance.
   * @param language
-  *   \- The base language in which the resource is written.
+  *   - The base language in which the resource is written.
   * @param category
-  *   \- Category of the identified substance.
+  *   - Category of the identified substance.
   * @param onset
-  *   \- Estimated or actual date, date-time, or age when allergy or intolerance was identified.
+  *   - Estimated or actual date, date-time, or age when allergy or intolerance was identified.
   * @param recorder
-  *   \- Individual who recorded the record and takes responsibility for its content.
+  *   - Individual who recorded the record and takes responsibility for its content.
   * @param asserter
-  *   \- The source of the information about the allergy that is recorded.
+  *   - The source of the information about the allergy that is recorded.
   * @param contained
-  *   \- These resources do not have an independent existence apart from the resource that contains them - they cannot be
-  *   identified independently, and nor can they have their own independent transaction scope.
+  *   - These resources do not have an independent existence apart from the resource that contains them - they cannot be
+  *     identified independently, and nor can they have their own independent transaction scope.
   * @param extension
-  *   \- May be used to represent additional information that is not part of the basic definition of the resource. To make the use
-  *   of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions.
-  *   Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition
-  *   of the extension.
+  *   - May be used to represent additional information that is not part of the basic definition of the resource. To make the use
+  *     of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions.
+  *     Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition
+  *     of the extension.
   * @param encounter
-  *   \- The encounter when the allergy or intolerance was asserted.
+  *   - The encounter when the allergy or intolerance was asserted.
   * @param criticality
-  *   \- Estimate of the potential clinical harm, or seriousness, of the reaction to the identified substance.
+  *   - Estimate of the potential clinical harm, or seriousness, of the reaction to the identified substance.
   * @param recordedDate
-  *   \- The recordedDate represents when this particular AllergyIntolerance record was created in the system, which is often a
-  *   system-generated date.
+  *   - The recordedDate represents when this particular AllergyIntolerance record was created in the system, which is often a
+  *     system-generated date.
   * @param implicitRules
-  *   \- A reference to a set of rules that were followed when the resource was constructed, and which must be understood when
-  *   processing the content. Often, this is a reference to an implementation guide that defines the special rules along with
-  *   other profiles etc.
+  *   - A reference to a set of rules that were followed when the resource was constructed, and which must be understood when
+  *     processing the content. Often, this is a reference to an implementation guide that defines the special rules along with
+  *     other profiles etc.
   * @param clinicalStatus
-  *   \- The clinical status of the allergy or intolerance.
+  *   - The clinical status of the allergy or intolerance.
   * @param lastOccurrence
-  *   \- Represents the date and/or time of the last known occurrence of a reaction event.
+  *   - Represents the date and/or time of the last known occurrence of a reaction event.
   * @param note
-  *   \- Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.
+  *   - Additional narrative about the propensity for the Adverse Reaction, not captured in other fields.
   * @param modifierExtension
-  *   \- May be used to represent additional information that is not part of the basic definition of the resource and that
-  *   modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants.
-  *   Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a
-  *   strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an
-  *   extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications
-  *   processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of any
-  *   elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).
+  *   - May be used to represent additional information that is not part of the basic definition of the resource and that modifies
+  *     the understanding of the element that contains it and/or the understanding of the containing element's descendants.
+  *     Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a
+  *     strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an
+  *     extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications
+  *     processing a resource are required to check for modifier extensions. Modifier extensions SHALL NOT change the meaning of
+  *     any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).
   * @param verificationStatus
-  *   \- Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance
-  *   (including pharmaceutical product).
+  *   - Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance
+  *     (including pharmaceutical product).
   * @param identifier
-  *   \- Business identifiers assigned to this AllergyIntolerance by the performer or other systems which remain constant as the
-  *   resource is updated and propagates from server to server.
+  *   - Business identifiers assigned to this AllergyIntolerance by the performer or other systems which remain constant as the
+  *     resource is updated and propagates from server to server.
   * @param reaction
-  *   \- Details about each adverse reaction event linked to exposure to the identified substance.
+  *   - Details about each adverse reaction event linked to exposure to the identified substance.
   */
 @POJOBoilerplate
 class UKCore_AllergyIntolerance(