Convert the `model` module to Kotlin #1465

JPercival · 2024-12-11T02:56:54Z

No description provided.

…ctory, ModelInfoReaderProvider

github-actions · 2024-12-11T02:58:43Z

Formatting check succeeded!

codecov · 2024-12-11T03:09:36Z

Codecov Report

Attention: Patch coverage is 31.66667% with 697 lines in your changes missing coverage. Please review.

Project coverage is 66.00%. Comparing base (f30c08a) to head (b9464ad).
Report is 4 commits behind head on feature-kotlin.

Files with missing lines	Patch %	Lines
...model/src/main/java/org/hl7/cql/model/ClassType.kt	22.22%	88 Missing and 3 partials ⚠️
...java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt	31.96%	80 Missing and 3 partials ⚠️
...java/org/cqframework/cql/cql2elm/LibraryBuilder.kt	49.10%	50 Missing and 7 partials ⚠️
...a/org/hl7/cql/model/GenericClassSignatureParser.kt	65.41%	29 Missing and 17 partials ⚠️
...model/src/main/java/org/hl7/cql/model/TupleType.kt	0.00%	46 Missing ⚠️
...rc/main/java/org/hl7/cql/model/NamespaceManager.kt	0.00%	37 Missing ⚠️
.../cqframework/cql/cql2elm/SystemFunctionResolver.kt	27.50%	25 Missing and 4 partials ⚠️
...org/cqframework/cql/cql2elm/model/ModelImporter.kt	45.09%	26 Missing and 2 partials ⚠️
...el/src/main/java/org/hl7/cql/model/IntervalType.kt	0.00%	25 Missing ⚠️
.../model/src/main/java/org/hl7/cql/model/ListType.kt	0.00%	25 Missing ⚠️
... and 31 more

Additional details and impacted files

@@                 Coverage Diff                  @@
##             feature-kotlin    #1465      +/-   ##
====================================================
+ Coverage             65.35%   66.00%   +0.65%     
+ Complexity             4315     4304      -11     
====================================================
  Files                   486      487       +1     
  Lines                 29234    28918     -316     
  Branches               5507     5430      -77     
====================================================
- Hits                  19105    19087      -18     
+ Misses                 7904     7623     -281     
+ Partials               2225     2208      -17

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lukedegruchy · 2024-12-11T15:28:28Z

Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/Model.kt

@@ -33,7 +33,7 @@ open class Model(val modelInfo: ModelInfo, modelManager: ModelManager?) {

        for (t in index.values) {
            if (t is ClassType && t.label != null) {
-                classIndex[casify(t.label)] = t
+                classIndex[casify(t.label!!)] = t


Are we sure we want to throw an NPE here or anywhere else in this PR we use !! ?

Ideally, no. I've been fixing the cases of these where it's reasonably straight forward to do so. In this case, the label property is mutable, meaning that it could change values between the null check (t.label != null) and the usage (t.label!!) if, for instance, the Model was shared between different threads. I looked at changing label to be immutable, but it requires a re-work of how the ClassTypes are initialized. I just decided it was a bigger change than I wanted do. I've mostly kept the APIs and usages of the classes the same, only grabbing low-hanging fruit.

...r/src/test/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessorTest.java

lukedegruchy · 2024-12-11T16:29:20Z

Src/java/model/src/main/java/org/hl7/cql/model/ClassType.kt

+
+    override fun isInstantiable(callType: DataType, context: InstantiationContext): Boolean {
+        return if (callType is ClassType && callType.elements.size == elements.size) {
+            sortedElements.zip(callType.sortedElements).all { (thisElement, thatElement) ->


We really need zip in Java

sonarqubecloud · 2024-12-11T16:41:54Z

Quality Gate failed

Failed conditions
73.7% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

lukedegruchy · 2024-12-11T16:57:49Z

Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/serializing/ModelInfoReaderFactory.kt

+                throw RuntimeException(
+                    java.lang.String.join(
+                        " ",
+                        "Multiple ModelInfoReaderProviders found on the classpath.",


Does Kotlin have multi-line Strings?

Yes. I’ve not tried them though. I’ll give the a shot.

JPercival added 26 commits December 6, 2024 12:32

ChoiceType

36824af

ClassTypeElement

59d0f87

InstantiationContext

8954f37

TupleType, TupleTypeelement, SearchType, Relationship

27f89df

NamespaceInfo

e4497d1

ModelContext

16a4a45

ModelIdentifier

3ee1968

ModelInfoProvider, NamespaceAware, ModelInfoReader, ModelInfoReaderFa…

736c5e4

…ctory, ModelInfoReaderProvider

small clean up

c8f8c7c

NamespaceManager, SystemModelInfoProvider

7375dba

clean up

eff6bd2

NamedType, InvalidRedeclarationException

b45e190

Break out DataType interface

3ba203d

DataType

6ac7773

BaseDataType

2820498

Little bit of cleanup for choice types

7e561d0

Fixing Locale for string format

ff701a2

ClassType

c7e55de

ProfileType

23ce817

ListType

aff5257

IntervalType

31526a1

TypeParameter

dcf26cd

TupleType, ClassType

4cbfae9

Bug fixes for classes and tuples

dbf3c7b

GenericClassSignatureParser

d364339

More cleanup of GenericClassSignatureParser

0fba7b3

JPercival requested review from brynrhodes and antvaset December 11, 2024 02:56

lukedegruchy reviewed Dec 11, 2024

View reviewed changes

...r/src/test/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessorTest.java Outdated Show resolved Hide resolved

Remove unused assertion

b9464ad

lukedegruchy reviewed Dec 11, 2024

View reviewed changes

lukedegruchy approved these changes Dec 11, 2024

View reviewed changes

JPercival merged commit 31160ea into feature-kotlin Dec 11, 2024
6 of 7 checks passed

JPercival deleted the feature-kotlin-model branch December 11, 2024 17:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert the `model` module to Kotlin #1465

Convert the `model` module to Kotlin #1465

JPercival commented Dec 11, 2024

github-actions bot commented Dec 11, 2024

codecov bot commented Dec 11, 2024 •

edited

Loading

lukedegruchy Dec 11, 2024 •

edited

Loading

JPercival Dec 11, 2024

lukedegruchy Dec 11, 2024

sonarqubecloud bot commented Dec 11, 2024

lukedegruchy Dec 11, 2024

JPercival Dec 11, 2024

Convert the model module to Kotlin #1465

Convert the model module to Kotlin #1465

Conversation

JPercival commented Dec 11, 2024

github-actions bot commented Dec 11, 2024

codecov bot commented Dec 11, 2024 • edited Loading

Codecov Report

lukedegruchy Dec 11, 2024 • edited Loading

Choose a reason for hiding this comment

JPercival Dec 11, 2024

Choose a reason for hiding this comment

lukedegruchy Dec 11, 2024

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 11, 2024

Quality Gate failed

lukedegruchy Dec 11, 2024

Choose a reason for hiding this comment

JPercival Dec 11, 2024

Choose a reason for hiding this comment

Convert the `model` module to Kotlin #1465

Convert the `model` module to Kotlin #1465

codecov bot commented Dec 11, 2024 •

edited

Loading

lukedegruchy Dec 11, 2024 •

edited

Loading